From 865eb546fe5b899158e031d22189323f49a05d30 Mon Sep 17 00:00:00 2001 From: "dbeam@chromium.org" Date: Thu, 19 Dec 2013 22:44:49 +0000 Subject: [PATCH] Add base:: to string16s in android_webview/. R=benm@chromium.org BUG=329295 Review URL: https://codereview.chromium.org/100453010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241958 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/browser/aw_content_browser_client.cc | 8 ++++---- android_webview/browser/aw_content_browser_client.h | 6 +++--- android_webview/browser/aw_contents_client_bridge_base.h | 6 +++--- android_webview/browser/aw_javascript_dialog_manager.cc | 6 +++--- android_webview/browser/aw_javascript_dialog_manager.h | 6 +++--- android_webview/browser/aw_login_delegate.cc | 8 ++++---- android_webview/browser/aw_login_delegate.h | 6 ++++-- android_webview/browser/find_helper.cc | 4 ++-- android_webview/browser/find_helper.h | 6 +++--- android_webview/browser/net/aw_network_delegate.cc | 2 +- android_webview/browser/net/aw_network_delegate.h | 2 +- android_webview/common/aw_content_client.cc | 2 +- android_webview/common/aw_content_client.h | 2 +- android_webview/common/aw_hit_test_data.h | 4 ++-- android_webview/common/print_messages.cc | 4 ++-- android_webview/common/print_messages.h | 4 ++-- android_webview/common/render_view_messages.h | 2 +- android_webview/native/aw_autofill_manager_delegate.cc | 10 +++++----- android_webview/native/aw_autofill_manager_delegate.h | 12 ++++++------ android_webview/native/aw_contents.cc | 6 +++--- android_webview/native/aw_contents_client_bridge.cc | 10 +++++----- android_webview/native/aw_contents_client_bridge.h | 6 +++--- android_webview/native/aw_web_contents_delegate.cc | 2 +- android_webview/native/aw_web_contents_delegate.h | 2 +- android_webview/native/state_serializer.cc | 2 +- android_webview/native/state_serializer_unittests.cc | 2 +- android_webview/renderer/aw_content_renderer_client.cc | 2 +- android_webview/renderer/aw_content_renderer_client.h | 2 +- android_webview/renderer/aw_render_view_ext.cc | 7 ++++--- 29 files changed, 72 insertions(+), 69 deletions(-) diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 0651bab19e97..07eec21fcd66 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -119,7 +119,7 @@ class AwAccessTokenStore : public content::AccessTokenStore { request.Run(access_token_set, NULL); } virtual void SaveAccessToken(const GURL& server_url, - const string16& access_token) OVERRIDE { } + const base::string16& access_token) OVERRIDE { } private: virtual ~AwAccessTokenStore() { } @@ -285,8 +285,8 @@ bool AwContentBrowserClient::AllowSetCookie(const GURL& url, bool AwContentBrowserClient::AllowWorkerDatabase( const GURL& url, - const string16& name, - const string16& display_name, + const base::string16& name, + const base::string16& display_name, unsigned long estimated_size, content::ResourceContext* context, const std::vector >& render_frames) { @@ -304,7 +304,7 @@ bool AwContentBrowserClient::AllowWorkerFileSystem( bool AwContentBrowserClient::AllowWorkerIndexedDB( const GURL& url, - const string16& name, + const base::string16& name, content::ResourceContext* context, const std::vector >& render_frames) { // Android WebView does not yet support web workers. diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index 3f81eca9e1a3..cc32a60c0925 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -76,8 +76,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient { net::CookieOptions* options) OVERRIDE; virtual bool AllowWorkerDatabase( const GURL& url, - const string16& name, - const string16& display_name, + const base::string16& name, + const base::string16& display_name, unsigned long estimated_size, content::ResourceContext* context, const std::vector >& render_frames) OVERRIDE; @@ -87,7 +87,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient { const std::vector >& render_frames) OVERRIDE; virtual bool AllowWorkerIndexedDB( const GURL& url, - const string16& name, + const base::string16& name, content::ResourceContext* context, const std::vector >& render_frames) OVERRIDE; virtual content::QuotaPermissionContext* diff --git a/android_webview/browser/aw_contents_client_bridge_base.h b/android_webview/browser/aw_contents_client_bridge_base.h index 3166f6be3145..0383a377b2a2 100644 --- a/android_webview/browser/aw_contents_client_bridge_base.h +++ b/android_webview/browser/aw_contents_client_bridge_base.h @@ -47,14 +47,14 @@ class AwContentsClientBridgeBase { virtual void RunJavaScriptDialog( content::JavaScriptMessageType message_type, const GURL& origin_url, - const string16& message_text, - const string16& default_prompt_text, + const base::string16& message_text, + const base::string16& default_prompt_text, const content::JavaScriptDialogManager::DialogClosedCallback& callback) = 0; virtual void RunBeforeUnloadDialog( const GURL& origin_url, - const string16& message_text, + const base::string16& message_text, const content::JavaScriptDialogManager::DialogClosedCallback& callback) = 0; diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc index 1690eac73726..630c7bfd7af0 100644 --- a/android_webview/browser/aw_javascript_dialog_manager.cc +++ b/android_webview/browser/aw_javascript_dialog_manager.cc @@ -19,8 +19,8 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog( const GURL& origin_url, const std::string& accept_lang, content::JavaScriptMessageType message_type, - const string16& message_text, - const string16& default_prompt_text, + const base::string16& message_text, + const base::string16& default_prompt_text, const DialogClosedCallback& callback, bool* did_suppress_message) { AwContentsClientBridgeBase* bridge = @@ -34,7 +34,7 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog( void AwJavaScriptDialogManager::RunBeforeUnloadDialog( content::WebContents* web_contents, - const string16& message_text, + const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) { AwContentsClientBridgeBase* bridge = diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h index f8db746edc35..e43932dd71bd 100644 --- a/android_webview/browser/aw_javascript_dialog_manager.h +++ b/android_webview/browser/aw_javascript_dialog_manager.h @@ -20,13 +20,13 @@ class AwJavaScriptDialogManager : public content::JavaScriptDialogManager { const GURL& origin_url, const std::string& accept_lang, content::JavaScriptMessageType message_type, - const string16& message_text, - const string16& default_prompt_text, + const base::string16& message_text, + const base::string16& default_prompt_text, const DialogClosedCallback& callback, bool* did_suppress_message) OVERRIDE; virtual void RunBeforeUnloadDialog( content::WebContents* web_contents, - const string16& message_text, + const base::string16& message_text, bool is_reload, const DialogClosedCallback& callback) OVERRIDE; virtual void CancelActiveAndPendingDialogs( diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc index 2c7325339a43..84ef2cb26499 100644 --- a/android_webview/browser/aw_login_delegate.cc +++ b/android_webview/browser/aw_login_delegate.cc @@ -66,8 +66,8 @@ AwLoginDelegate::~AwLoginDelegate() { DCHECK(aw_http_auth_handler_ == NULL); } -void AwLoginDelegate::Proceed(const string16& user, - const string16& password) { +void AwLoginDelegate::Proceed(const base::string16& user, + const base::string16& password) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, base::Bind(&AwLoginDelegate::ProceedOnIOThread, @@ -112,8 +112,8 @@ void AwLoginDelegate::CancelOnIOThread() { DeleteAuthHandlerSoon(); } -void AwLoginDelegate::ProceedOnIOThread(const string16& user, - const string16& password) { +void AwLoginDelegate::ProceedOnIOThread(const base::string16& user, + const base::string16& password) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (request_) { request_->SetAuth(net::AuthCredentials(user, password)); diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h index 2542f06b9f8d..f0f8769ddb33 100644 --- a/android_webview/browser/aw_login_delegate.h +++ b/android_webview/browser/aw_login_delegate.h @@ -24,7 +24,8 @@ class AwLoginDelegate : AwLoginDelegate(net::AuthChallengeInfo* auth_info, net::URLRequest* request); - virtual void Proceed(const string16& user, const string16& password); + virtual void Proceed(const base::string16& user, + const base::string16& password); virtual void Cancel(); // from ResourceDispatcherHostLoginDelegate @@ -34,7 +35,8 @@ class AwLoginDelegate : virtual ~AwLoginDelegate(); void HandleHttpAuthRequestOnUIThread(bool first_auth_attempt); void CancelOnIOThread(); - void ProceedOnIOThread(const string16& user, const string16& password); + void ProceedOnIOThread(const base::string16& user, + const base::string16& password); void DeleteAuthHandlerSoon(); scoped_ptr aw_http_auth_handler_; diff --git a/android_webview/browser/find_helper.cc b/android_webview/browser/find_helper.cc index 15ae0acecda2..bf6f71206d42 100644 --- a/android_webview/browser/find_helper.cc +++ b/android_webview/browser/find_helper.cc @@ -35,7 +35,7 @@ void FindHelper::SetListener(Listener* listener) { listener_ = listener; } -void FindHelper::FindAllAsync(const string16& search_string) { +void FindHelper::FindAllAsync(const base::string16& search_string) { // Stop any ongoing asynchronous request. web_contents()->GetRenderViewHost()->StopFinding( content::STOP_FIND_ACTION_KEEP_SELECTION); @@ -90,7 +90,7 @@ void FindHelper::ClearMatches() { last_active_ordinal_ = -1; } -void FindHelper::StartNewRequest(const string16& search_string) { +void FindHelper::StartNewRequest(const base::string16& search_string) { current_request_id_ = find_request_id_counter_++; last_search_string_ = search_string; last_match_count_ = -1; diff --git a/android_webview/browser/find_helper.h b/android_webview/browser/find_helper.h index 7662ec5a36a8..eabf19750c45 100644 --- a/android_webview/browser/find_helper.h +++ b/android_webview/browser/find_helper.h @@ -32,7 +32,7 @@ class FindHelper : public content::WebContentsObserver { void SetListener(Listener* listener); // Asynchronous API. - void FindAllAsync(const string16& search_string); + void FindAllAsync(const base::string16& search_string); void HandleFindReply(int request_id, int match_count, int active_ordinal, @@ -43,7 +43,7 @@ class FindHelper : public content::WebContentsObserver { void ClearMatches(); private: - void StartNewRequest(const string16& search_string); + void StartNewRequest(const base::string16& search_string); void NotifyResults(int active_ordinal, int match_count, bool finished); // Listener results are reported to. @@ -59,7 +59,7 @@ class FindHelper : public content::WebContentsObserver { int current_request_id_; // Required by FindNext and the incremental find replies. - string16 last_search_string_; + base::string16 last_search_string_; int last_match_count_; int last_active_ordinal_; diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc index b9059b8cc9aa..1dd525d61c25 100644 --- a/android_webview/browser/net/aw_network_delegate.cc +++ b/android_webview/browser/net/aw_network_delegate.cc @@ -67,7 +67,7 @@ void AwNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) { } void AwNetworkDelegate::OnPACScriptError(int line_number, - const string16& error) { + const base::string16& error) { } net::NetworkDelegate::AuthRequiredResponse AwNetworkDelegate::OnAuthRequired( diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h index de1af58f94c9..e9756dc4e10a 100644 --- a/android_webview/browser/net/aw_network_delegate.h +++ b/android_webview/browser/net/aw_network_delegate.h @@ -40,7 +40,7 @@ class AwNetworkDelegate : public net::NetworkDelegate { virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE; virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE; virtual void OnPACScriptError(int line_number, - const string16& error) OVERRIDE; + const base::string16& error) OVERRIDE; virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired( net::URLRequest* request, const net::AuthChallengeInfo& auth_info, diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc index 30ef6c249e9a..e91faa98d424 100644 --- a/android_webview/common/aw_content_client.cc +++ b/android_webview/common/aw_content_client.cc @@ -31,7 +31,7 @@ std::string AwContentClient::GetUserAgent() const { return webkit_glue::BuildUserAgentFromProduct(product); } -string16 AwContentClient::GetLocalizedString(int message_id) const { +base::string16 AwContentClient::GetLocalizedString(int message_id) const { // TODO(boliu): Used only by WebKit, so only bundle those resources for // Android WebView. return l10n_util::GetStringUTF16(message_id); diff --git a/android_webview/common/aw_content_client.h b/android_webview/common/aw_content_client.h index 35ae7cba9c79..b7649443e986 100644 --- a/android_webview/common/aw_content_client.h +++ b/android_webview/common/aw_content_client.h @@ -16,7 +16,7 @@ class AwContentClient : public content::ContentClient { // ContentClient implementation. virtual std::string GetProduct() const OVERRIDE; virtual std::string GetUserAgent() const OVERRIDE; - virtual string16 GetLocalizedString(int message_id) const OVERRIDE; + virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE; virtual base::StringPiece GetDataResource( int resource_id, ui::ScaleFactor scale_factor) const OVERRIDE; diff --git a/android_webview/common/aw_hit_test_data.h b/android_webview/common/aw_hit_test_data.h index ee600f52c13f..8e5919b71bd8 100644 --- a/android_webview/common/aw_hit_test_data.h +++ b/android_webview/common/aw_hit_test_data.h @@ -66,8 +66,8 @@ struct AwHitTestData { // Java. int type; // Only values from enum Type above. std::string extra_data_for_type; - string16 href; - string16 anchor_text; + base::string16 href; + base::string16 anchor_text; GURL img_src; AwHitTestData(); diff --git a/android_webview/common/print_messages.cc b/android_webview/common/print_messages.cc index a87049812f79..f7d3597bcd2b 100644 --- a/android_webview/common/print_messages.cc +++ b/android_webview/common/print_messages.cc @@ -55,8 +55,8 @@ void PrintMsg_Print_Params::Reset() { print_scaling_option = blink::WebPrintScalingOptionSourceSize; print_to_pdf = false; display_header_footer = false; - title = string16(); - url = string16(); + title = base::string16(); + url = base::string16(); should_print_backgrounds = false; } diff --git a/android_webview/common/print_messages.h b/android_webview/common/print_messages.h index 436bc9670be4..241be605645f 100644 --- a/android_webview/common/print_messages.h +++ b/android_webview/common/print_messages.h @@ -47,8 +47,8 @@ struct PrintMsg_Print_Params { blink::WebPrintScalingOption print_scaling_option; bool print_to_pdf; bool display_header_footer; - string16 title; - string16 url; + base::string16 title; + base::string16 url; bool should_print_backgrounds; }; diff --git a/android_webview/common/render_view_messages.h b/android_webview/common/render_view_messages.h index f9a27af816e8..163d9c9631db 100644 --- a/android_webview/common/render_view_messages.h +++ b/android_webview/common/render_view_messages.h @@ -108,5 +108,5 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_OnContentsSizeChanged, // or creating a URLRequest for the main frame resource. IPC_SYNC_MESSAGE_CONTROL2_1(AwViewHostMsg_ShouldOverrideUrlLoading, int /* routing id */, - string16 /* in - url */, + base::string16 /* in - url */, bool /* out - result */) diff --git a/android_webview/native/aw_autofill_manager_delegate.cc b/android_webview/native/aw_autofill_manager_delegate.cc index 9be482b914d1..4c731eca9512 100644 --- a/android_webview/native/aw_autofill_manager_delegate.cc +++ b/android_webview/native/aw_autofill_manager_delegate.cc @@ -84,9 +84,9 @@ AwAutofillManagerDelegate::GetDatabase() { void AwAutofillManagerDelegate::ShowAutofillPopup( const gfx::RectF& element_bounds, base::i18n::TextDirection text_direction, - const std::vector& values, - const std::vector& labels, - const std::vector& icons, + const std::vector& values, + const std::vector& labels, + const std::vector& icons, const std::vector& identifiers, base::WeakPtr delegate) { @@ -108,8 +108,8 @@ void AwAutofillManagerDelegate::ShowAutofillPopup( void AwAutofillManagerDelegate::ShowAutofillPopupImpl( const gfx::RectF& element_bounds, - const std::vector& values, - const std::vector& labels, + const std::vector& values, + const std::vector& labels, const std::vector& identifiers) { JNIEnv* env = AttachCurrentThread(); ScopedJavaLocalRef obj = java_ref_.get(env); diff --git a/android_webview/native/aw_autofill_manager_delegate.h b/android_webview/native/aw_autofill_manager_delegate.h index 281364e13783..accc423f9cd2 100644 --- a/android_webview/native/aw_autofill_manager_delegate.h +++ b/android_webview/native/aw_autofill_manager_delegate.h @@ -74,9 +74,9 @@ class AwAutofillManagerDelegate virtual void ShowAutofillPopup( const gfx::RectF& element_bounds, base::i18n::TextDirection text_direction, - const std::vector& values, - const std::vector& labels, - const std::vector& icons, + const std::vector& values, + const std::vector& labels, + const std::vector& icons, const std::vector& identifiers, base::WeakPtr delegate) OVERRIDE; virtual void UpdateAutofillPopupDataListValues( @@ -95,8 +95,8 @@ class AwAutofillManagerDelegate friend class content::WebContentsUserData; void ShowAutofillPopupImpl(const gfx::RectF& element_bounds, - const std::vector& values, - const std::vector& labels, + const std::vector& values, + const std::vector& labels, const std::vector& identifiers); // The web_contents associated with this delegate. @@ -105,7 +105,7 @@ class AwAutofillManagerDelegate JavaObjectWeakGlobalRef java_ref_; // The current Autofill query values. - std::vector values_; + std::vector values_; std::vector identifiers_; base::WeakPtr delegate_; diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc index f86b0ad6ef40..3df421f86d14 100644 --- a/android_webview/native/aw_contents.cc +++ b/android_webview/native/aw_contents.cc @@ -429,13 +429,13 @@ void AwContents::AddVisitedLinks(JNIEnv* env, jobject obj, jobjectArray jvisited_links) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - std::vector visited_link_strings; + std::vector visited_link_strings; base::android::AppendJavaStringArrayToStringVector( env, jvisited_links, &visited_link_strings); std::vector visited_link_gurls; - for (std::vector::const_iterator itr = visited_link_strings.begin(); - itr != visited_link_strings.end(); + std::vector::const_iterator itr; + for (itr = visited_link_strings.begin(); itr != visited_link_strings.end(); ++itr) { visited_link_gurls.push_back(GURL(*itr)); } diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc index 15f1a1bc1e3d..c21de5e507e6 100644 --- a/android_webview/native/aw_contents_client_bridge.cc +++ b/android_webview/native/aw_contents_client_bridge.cc @@ -90,8 +90,8 @@ void AwContentsClientBridge::ProceedSslError(JNIEnv* env, jobject obj, void AwContentsClientBridge::RunJavaScriptDialog( content::JavaScriptMessageType message_type, const GURL& origin_url, - const string16& message_text, - const string16& default_prompt_text, + const base::string16& message_text, + const base::string16& default_prompt_text, const content::JavaScriptDialogManager::DialogClosedCallback& callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); JNIEnv* env = AttachCurrentThread(); @@ -134,7 +134,7 @@ void AwContentsClientBridge::RunJavaScriptDialog( void AwContentsClientBridge::RunBeforeUnloadDialog( const GURL& origin_url, - const string16& message_text, + const base::string16& message_text, const content::JavaScriptDialogManager::DialogClosedCallback& callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); JNIEnv* env = AttachCurrentThread(); @@ -177,7 +177,7 @@ void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env, LOG(WARNING) << "Unexpected JS dialog confirm. " << id; return; } - string16 prompt_text; + base::string16 prompt_text; if (prompt) { prompt_text = ConvertJavaStringToUTF16(env, prompt); } @@ -193,7 +193,7 @@ void AwContentsClientBridge::CancelJsResult(JNIEnv*, jobject, int id) { LOG(WARNING) << "Unexpected JS dialog cancel. " << id; return; } - callback->Run(false, string16()); + callback->Run(false, base::string16()); pending_js_dialog_callbacks_.Remove(id); } diff --git a/android_webview/native/aw_contents_client_bridge.h b/android_webview/native/aw_contents_client_bridge.h index fcb82d515b6e..4cd6c6caa130 100644 --- a/android_webview/native/aw_contents_client_bridge.h +++ b/android_webview/native/aw_contents_client_bridge.h @@ -43,13 +43,13 @@ class AwContentsClientBridge : public AwContentsClientBridgeBase { virtual void RunJavaScriptDialog( content::JavaScriptMessageType message_type, const GURL& origin_url, - const string16& message_text, - const string16& default_prompt_text, + const base::string16& message_text, + const base::string16& default_prompt_text, const content::JavaScriptDialogManager::DialogClosedCallback& callback) OVERRIDE; virtual void RunBeforeUnloadDialog( const GURL& origin_url, - const string16& message_text, + const base::string16& message_text, const content::JavaScriptDialogManager::DialogClosedCallback& callback) OVERRIDE; virtual bool ShouldOverrideUrlLoading(const base::string16& url) OVERRIDE; diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc index 39bb1b0feb3c..68de084f2589 100644 --- a/android_webview/native/aw_web_contents_delegate.cc +++ b/android_webview/native/aw_web_contents_delegate.cc @@ -164,7 +164,7 @@ void AwWebContentsDelegate::AddNewContents(WebContents* source, void AwWebContentsDelegate::WebContentsCreated( WebContents* source_contents, int64 source_frame_id, - const string16& frame_name, + const base::string16& frame_name, const GURL& target_url, content::WebContents* new_contents) { AwContentsIoThreadClientImpl::RegisterPendingContents(new_contents); diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h index 39fea2c8f052..fcd0793ec41a 100644 --- a/android_webview/native/aw_web_contents_delegate.h +++ b/android_webview/native/aw_web_contents_delegate.h @@ -43,7 +43,7 @@ class AwWebContentsDelegate virtual void WebContentsCreated(content::WebContents* source_contents, int64 source_frame_id, - const string16& frame_name, + const base::string16& frame_name, const GURL& target_url, content::WebContents* new_contents) OVERRIDE; diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc index f4a628b39a70..9b013a17710e 100644 --- a/android_webview/native/state_serializer.cc +++ b/android_webview/native/state_serializer.cc @@ -226,7 +226,7 @@ bool RestoreNavigationEntryFromPickle(PickleIterator* iterator, } { - string16 title; + base::string16 title; if (!iterator->ReadString16(&title)) return false; entry->SetTitle(title); diff --git a/android_webview/native/state_serializer_unittests.cc b/android_webview/native/state_serializer_unittests.cc index d3a7080e3d81..18fb101be96c 100644 --- a/android_webview/native/state_serializer_unittests.cc +++ b/android_webview/native/state_serializer_unittests.cc @@ -46,7 +46,7 @@ TEST(AndroidWebViewStateSerializerTest, TestNavigationEntrySerialization) { content::Referrer referrer; referrer.url = GURL("http://referrer_url"); referrer.policy = blink::WebReferrerPolicyOrigin; - const string16 title(UTF8ToUTF16("title")); + const base::string16 title(UTF8ToUTF16("title")); const content::PageState page_state = content::PageState::CreateFromEncodedData("completely bogus state"); const bool has_post_data = true; diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc index 8f7039754238..4ae2012f23bb 100644 --- a/android_webview/renderer/aw_content_renderer_client.cc +++ b/android_webview/renderer/aw_content_renderer_client.cc @@ -145,7 +145,7 @@ void AwContentRendererClient::GetNavigationErrorStrings( const blink::WebURLError& error, const std::string& accept_languages, std::string* error_html, - string16* error_description) { + base::string16* error_description) { if (error_html) { GURL error_url(failed_request.url()); std::string err = UTF16ToUTF8(error.localizedDescription); diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h index 6ee2fa140e45..3a553502a427 100644 --- a/android_webview/renderer/aw_content_renderer_client.h +++ b/android_webview/renderer/aw_content_renderer_client.h @@ -34,7 +34,7 @@ class AwContentRendererClient : public content::ContentRendererClient { const blink::WebURLError& error, const std::string& accept_languages, std::string* error_html, - string16* error_description) OVERRIDE; + base::string16* error_description) OVERRIDE; virtual unsigned long long VisitedLinkHash(const char* canonical_url, size_t length) OVERRIDE; virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE; diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index 4865bf32ca20..83f1c7a72aa1 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -37,11 +37,12 @@ namespace android_webview { namespace { -GURL GetAbsoluteUrl(const blink::WebNode& node, const string16& url_fragment) { +GURL GetAbsoluteUrl(const blink::WebNode& node, + const base::string16& url_fragment) { return GURL(node.document().completeURL(url_fragment)); } -string16 GetHref(const blink::WebElement& element) { +base::string16 GetHref(const blink::WebElement& element) { // Get the actual 'href' attribute, which might relative if valid or can // possibly contain garbage otherwise, so not using absoluteLinkURL here. return element.getAttribute("href"); @@ -73,7 +74,7 @@ bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix, url_util::DecodeURLEscapeSequences(spec.data() + prefix.length(), spec.length() - prefix.length(), &output); std::string decoded_url = UTF16ToUTF8( - string16(output.data(), output.length())); + base::string16(output.data(), output.length())); dest->assign(decoded_url.begin(), decoded_url.end()); return true; } -- 2.11.4.GIT