diff options
Diffstat (limited to 'chrome/browser/extensions')
84 files changed, 273 insertions, 244 deletions
diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index 14a1424..8ac6eab 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc @@ -23,7 +23,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { process_manager()->GetBackgroundHostForExtension(extension->id()); ASSERT_TRUE(host); host->render_view_host()->ExecuteJavascriptInWebFrame(base::string16(), - ASCIIToUTF16("alert('This should not crash.');")); + base::ASCIIToUTF16("alert('This should not crash.');")); AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); ASSERT_TRUE(alert); diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc index 29c3714..d38ff2f 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.cc @@ -17,7 +17,7 @@ namespace bluetooth { void BluetoothDeviceToApiDevice(const device::BluetoothDevice& device, Device* out) { out->address = device.GetAddress(); - out->name.reset(new std::string(UTF16ToUTF8(device.GetName()))); + out->name.reset(new std::string(base::UTF16ToUTF8(device.GetName()))); out->paired.reset(new bool(device.IsPaired())); out->connected.reset(new bool(device.IsConnected())); } diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc index c2984c6..6a0b3e3 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc @@ -35,9 +35,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BookmarkManagerEditDisabled) { BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); test::WaitForBookmarkModelToLoad(model); const BookmarkNode* bar = model->bookmark_bar_node(); - const BookmarkNode* folder = model->AddFolder(bar, 0, ASCIIToUTF16("Folder")); - model->AddURL(bar, 1, ASCIIToUTF16("AAA"), GURL("http://aaa.example.com")); - model->AddURL(folder, 0, ASCIIToUTF16("BBB"), GURL("http://bbb.example.com")); + const BookmarkNode* folder = + model->AddFolder(bar, 0, base::ASCIIToUTF16("Folder")); + model->AddURL(bar, 1, base::ASCIIToUTF16("AAA"), + GURL("http://aaa.example.com")); + model->AddURL(folder, 0, base::ASCIIToUTF16("BBB"), + GURL("http://bbb.example.com")); PrefService* prefs = user_prefs::UserPrefs::Get(profile); prefs->SetBoolean(prefs::kEditBookmarksEnabled, false); diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc index 5df23d9..47920e5 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc @@ -61,7 +61,7 @@ BookmarkTreeNode* GetBookmarkTreeNode(const BookmarkNode* node, } } - bookmark_tree_node->title = UTF16ToUTF8(node->GetTitle()); + bookmark_tree_node->title = base::UTF16ToUTF8(node->GetTitle()); if (!node->date_added().is_null()) { // Javascript Date wants milliseconds since the epoch, ToDoubleT is seconds. bookmark_tree_node->date_added.reset( diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc index efb54a75..ee0eaaf 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc @@ -23,16 +23,18 @@ class ExtensionBookmarksTest : public testing::Test { public: virtual void SetUp() OVERRIDE { model_.reset(new BookmarkModel(NULL)); - model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("Digg"), + model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("Digg"), GURL("http://www.reddit.com")); - model_->AddURL(model_->other_node(), 0, ASCIIToUTF16("News"), + model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("News"), GURL("http://www.foxnews.com")); folder_ = model_->AddFolder( - model_->other_node(), 0, ASCIIToUTF16("outer folder")); - model_->AddFolder(folder_, 0, ASCIIToUTF16("inner folder 1")); - model_->AddFolder(folder_, 0, ASCIIToUTF16("inner folder 2")); - model_->AddURL(folder_, 0, ASCIIToUTF16("Digg"), GURL("http://reddit.com")); - model_->AddURL(folder_, 0, ASCIIToUTF16("CNet"), GURL("http://cnet.com")); + model_->other_node(), 0, base::ASCIIToUTF16("outer folder")); + model_->AddFolder(folder_, 0, base::ASCIIToUTF16("inner folder 1")); + model_->AddFolder(folder_, 0, base::ASCIIToUTF16("inner folder 2")); + model_->AddURL( + folder_, 0, base::ASCIIToUTF16("Digg"), GURL("http://reddit.com")); + model_->AddURL( + folder_, 0, base::ASCIIToUTF16("CNet"), GURL("http://cnet.com")); } scoped_ptr<BookmarkModel> model_; diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index f9b253a..32068e1 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -441,7 +441,7 @@ bool BookmarksSearchFunction::RunImpl() { if (params->query.as_string) { bookmark_utils::QueryFields query; query.word_phrase_query.reset( - new base::string16(UTF8ToUTF16(*params->query.as_string))); + new base::string16(base::UTF8ToUTF16(*params->query.as_string))); bookmark_utils::GetBookmarksMatchingProperties( BookmarkModelFactory::GetForProfile(GetProfile()), query, @@ -455,12 +455,12 @@ bool BookmarksSearchFunction::RunImpl() { bookmark_utils::QueryFields query; if (object.query) { query.word_phrase_query.reset( - new base::string16(UTF8ToUTF16(*object.query))); + new base::string16(base::UTF8ToUTF16(*object.query))); } if (object.url) - query.url.reset(new base::string16(UTF8ToUTF16(*object.url))); + query.url.reset(new base::string16(base::UTF8ToUTF16(*object.url))); if (object.title) - query.title.reset(new base::string16(UTF8ToUTF16(*object.title))); + query.title.reset(new base::string16(base::UTF8ToUTF16(*object.title))); bookmark_utils::GetBookmarksMatchingProperties( BookmarkModelFactory::GetForProfile(GetProfile()), query, @@ -558,7 +558,7 @@ bool BookmarksCreateFunction::RunImpl() { base::string16 title; // Optional. if (params->bookmark.title.get()) - title = UTF8ToUTF16(*params->bookmark.title.get()); + title = base::UTF8ToUTF16(*params->bookmark.title.get()); std::string url_string; // Optional. if (params->bookmark.url.get()) @@ -675,7 +675,7 @@ bool BookmarksUpdateFunction::RunImpl() { base::string16 title; bool has_title = false; if (params->changes.title.get()) { - title = UTF8ToUTF16(*params->changes.title); + title = base::UTF8ToUTF16(*params->changes.title); has_title = true; } @@ -753,7 +753,7 @@ class CreateBookmarkBucketMapper : public BookmarkBucketMapper<std::string> { if (!parent) return; - std::string bucket_id = UTF16ToUTF8(parent->GetTitle()); + std::string bucket_id = base::UTF16ToUTF8(parent->GetTitle()); std::string title; json->GetString(keys::kTitleKey, &title); std::string url_string; @@ -790,8 +790,8 @@ class RemoveBookmarksBucketMapper : public BookmarkBucketMapper<std::string> { return; std::string bucket_id; - bucket_id += UTF16ToUTF8(node->parent()->GetTitle()); - bucket_id += UTF16ToUTF8(node->GetTitle()); + bucket_id += base::UTF16ToUTF8(node->parent()->GetTitle()); + bucket_id += base::UTF16ToUTF8(node->GetTitle()); bucket_id += node->url().spec(); buckets->push_back(GetBucket(base::SHA1HashString(bucket_id))); } diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index e17de51..698a4ca 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -218,16 +218,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionContentSettingsApiTest, const char* kBarName = "Bar Plugin"; content::PluginService::GetInstance()->RegisterInternalPlugin( - content::WebPluginInfo(ASCIIToUTF16(kFooName), + content::WebPluginInfo(base::ASCIIToUTF16(kFooName), base::FilePath(kFooPath), - ASCIIToUTF16("1.2.3"), - ASCIIToUTF16("foo")), + base::ASCIIToUTF16("1.2.3"), + base::ASCIIToUTF16("foo")), false); content::PluginService::GetInstance()->RegisterInternalPlugin( - content::WebPluginInfo(ASCIIToUTF16(kBarName), + content::WebPluginInfo(base::ASCIIToUTF16(kBarName), base::FilePath(kBarPath), - ASCIIToUTF16("2.3.4"), - ASCIIToUTF16("bar")), + base::ASCIIToUTF16("2.3.4"), + base::ASCIIToUTF16("bar")), false); EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 954bbe9..750bd1e 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -69,8 +69,9 @@ scoped_ptr<Cookie> CreateCookie( // A cookie is a raw byte sequence. By explicitly parsing it as UTF-8, we // apply error correction, so the string can be safely passed to the renderer. - cookie->name = UTF16ToUTF8(UTF8ToUTF16(canonical_cookie.Name())); - cookie->value = UTF16ToUTF8(UTF8ToUTF16(canonical_cookie.Value())); + cookie->name = base::UTF16ToUTF8(base::UTF8ToUTF16(canonical_cookie.Name())); + cookie->value = + base::UTF16ToUTF8(base::UTF8ToUTF16(canonical_cookie.Value())); cookie->domain = canonical_cookie.Domain(); cookie->host_only = net::cookie_util::DomainIsHostOnly( canonical_cookie.Domain()); diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 6a21a3f..ec07c42 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -216,7 +216,7 @@ bool ExtensionDevToolsInfoBarDelegate::ShouldExpireInternal( base::string16 ExtensionDevToolsInfoBarDelegate::GetMessageText() const { return l10n_util::GetStringFUTF16(IDS_DEV_TOOLS_INFOBAR_LABEL, - UTF8ToUTF16(client_name_)); + base::UTF8ToUTF16(client_name_)); } int ExtensionDevToolsInfoBarDelegate::GetButtons() const { diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc index 9cd24f25..3a67a6a 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc @@ -186,7 +186,7 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() { &DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults, this); picker_->Show(parent_window, parent_window, - UTF8ToUTF16(GetExtension()->name()), + base::UTF8ToUTF16(GetExtension()->name()), media_list.Pass(), callback); return true; } diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index d89cc9c..b12ce87 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -320,7 +320,7 @@ scoped_ptr<developer::ItemInfo> if (Manifest::IsUnpackedLocation(item.location())) { info->path.reset( - new std::string(UTF16ToUTF8(item.path().LossyDisplayName()))); + new std::string(base::UTF16ToUTF8(item.path().LossyDisplayName()))); for (std::vector<extensions::InstallWarning>::const_iterator it = item.install_warnings().begin(); it != item.install_warnings().end(); ++it) { @@ -769,7 +769,7 @@ void DeveloperPrivateEnableFunction::OnRequirementsChecked( service->EnableExtension(extension_id); } else { ExtensionErrorReporter::GetInstance()->ReportError( - UTF8ToUTF16(JoinString(requirements_errors, ' ')), + base::UTF8ToUTF16(JoinString(requirements_errors, ' ')), true /* be noisy */); } Release(); @@ -877,8 +877,8 @@ void DeveloperPrivatePackDirectoryFunction::OnPackSuccess( const base::FilePath& crx_file, const base::FilePath& pem_file) { developer::PackDirectoryResponse response; - response.message = - UTF16ToUTF8(PackExtensionJob::StandardSuccessMessage(crx_file, pem_file)); + response.message = base::UTF16ToUTF8( + PackExtensionJob::StandardSuccessMessage(crx_file, pem_file)); response.status = developer::PACK_STATUS_SUCCESS; results_ = developer::PackDirectory::Results::Create(response); SendResponse(true); @@ -1210,7 +1210,7 @@ bool DeveloperPrivateChoosePathFunction::RunImpl() { void DeveloperPrivateChoosePathFunction::FileSelected( const base::FilePath& path) { - SetResult(new base::StringValue(UTF16ToUTF8(path.LossyDisplayName()))); + SetResult(new base::StringValue(base::UTF16ToUTF8(path.LossyDisplayName()))); SendResponse(true); Release(); } diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index d76f697..0e9c267 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -191,7 +191,7 @@ bool GetFileTypesFromAcceptOption( std::string extension = *iter; StringToLowerASCII(&extension); #if defined(OS_WIN) - extension_set.insert(UTF8ToWide(*iter)); + extension_set.insert(base::UTF8ToWide(*iter)); #else extension_set.insert(*iter); #endif @@ -203,7 +203,7 @@ bool GetFileTypesFromAcceptOption( return false; if (accept_option.description.get()) - *description = UTF8ToUTF16(*accept_option.description.get()); + *description = base::UTF8ToUTF16(*accept_option.description.get()); else if (description_id) *description = l10n_util::GetStringUTF16(description_id); @@ -731,7 +731,7 @@ void FileSystemChooseEntryFunction::ConfirmDirectoryAccessOnFileThread( base::Bind( CreateDirectoryAccessConfirmationDialog, app_file_handler_util::HasFileSystemWritePermission(extension_), - UTF8ToUTF16(extension_->name()), + base::UTF8ToUTF16(extension_->name()), web_contents, base::Bind( &FileSystemChooseEntryFunction::OnDirectoryAccessConfirmed, diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc index 6c7ab46..ba2fd95 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc @@ -47,7 +47,7 @@ AcceptOption* BuildAcceptOption(std::string description, } #if defined(OS_WIN) -#define ToStringType UTF8ToWide +#define ToStringType base::UTF8ToWide #else #define ToStringType #endif @@ -150,7 +150,7 @@ TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionFileTypeInfoTest) { FileSystemChooseEntryFunction::BuildFileTypeInfo(&file_type_info, base::FilePath::StringType(), &options, &acceptsAllTypes); EXPECT_EQ(file_type_info.extension_description_overrides[0], - UTF8ToUTF16("File Types 101")); + base::UTF8ToUTF16("File Types 101")); } TEST_F(FileSystemApiUnitTest, FileSystemChooseEntryFunctionSuggestionTest) { diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 6504afe..8ea8cd7 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -66,7 +66,7 @@ scoped_ptr<HistoryItem> GetHistoryItem(const history::URLRow& row) { history_item->id = base::Int64ToString(row.id()); history_item->url.reset(new std::string(row.url().spec())); - history_item->title.reset(new std::string(UTF16ToUTF8(row.title()))); + history_item->title.reset(new std::string(base::UTF16ToUTF8(row.title()))); history_item->last_visit_time.reset( new double(MilliSecondsFromTime(row.last_visit()))); history_item->typed_count.reset(new int(row.typed_count())); @@ -334,7 +334,7 @@ bool HistorySearchFunction::RunAsyncImpl() { scoped_ptr<Search::Params> params(Search::Params::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); - base::string16 search_text = UTF8ToUTF16(params->query.text); + base::string16 search_text = base::UTF8ToUTF16(params->query.text); history::QueryOptions options; options.SetRecentDayRange(1); diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc index 93e3b54..d0f3fa5 100644 --- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc +++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc @@ -48,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) { base::string16 title; ui_test_utils::GetCurrentTabTitle(browser(), &title); - EXPECT_EQ(std::string("FIRSTMESSAGE"), UTF16ToUTF8(title)); + EXPECT_EQ(std::string("FIRSTMESSAGE"), base::UTF16ToUTF8(title)); // Change messages.json file and reload extension. base::CopyFile( @@ -64,5 +64,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) { EXPECT_TRUE(catcher.GetNextResult()); ui_test_utils::GetCurrentTabTitle(browser(), &title); - EXPECT_EQ(std::string("SECONDMESSAGE"), UTF16ToUTF8(title)); + EXPECT_EQ(std::string("SECONDMESSAGE"), base::UTF16ToUTF8(title)); } diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc index 01a284c..21973824cf 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc @@ -192,7 +192,7 @@ void WebAuthFlow::Observe(int type, if (title->first) { delegate_->OnAuthFlowTitleChange( - UTF16ToUTF8(title->first->GetTitle())); + base::UTF16ToUTF8(title->first->GetTitle())); } break; } diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 76f308c..eb45dfa 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -83,7 +83,7 @@ std::vector<std::string> CreateWarningsList(const Extension* extension) { PermissionsData::GetPermissionMessages(extension); for (PermissionMessages::const_iterator iter = warnings.begin(); iter != warnings.end(); ++iter) { - warnings_list.push_back(UTF16ToUTF8(iter->message())); + warnings_list.push_back(base::UTF16ToUTF8(iter->message())); } return warnings_list; diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc index effdcf1..477ebb19 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc @@ -109,7 +109,7 @@ class MediaGalleriesPlatformAppBrowserTest : public PlatformAppBrowserTest { StorageMonitor::GetInstance()->receiver()->ProcessAttach( StorageInfo(device_id_, base::string16(), kDevicePath, - ASCIIToUTF16(kDeviceName), base::string16(), + base::ASCIIToUTF16(kDeviceName), base::string16(), base::string16(), 0)); content::RunAllPendingInMessageLoop(); } diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc index 4eaa393..e6757f2 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc @@ -78,7 +78,7 @@ class MediaGalleriesPrivateApiTest : public ExtensionApiTest { const std::string& ok_message) { ExtensionTestMessageListener listener(ok_message, false /* no reply */); host->ExecuteJavascriptInWebFrame(base::string16(), - ASCIIToUTF16(js_command)); + base::ASCIIToUTF16(js_command)); EXPECT_TRUE(listener.WaitUntilSatisfied()); } @@ -89,7 +89,7 @@ class MediaGalleriesPrivateApiTest : public ExtensionApiTest { void Attach() { DCHECK(StorageMonitor::GetInstance()->IsInitialized()); - StorageInfo info(device_id_, ASCIIToUTF16(kDeviceName), kDevicePath, + StorageInfo info(device_id_, base::ASCIIToUTF16(kDeviceName), kDevicePath, base::string16(), base::string16(), base::string16(), 0); StorageMonitor::GetInstance()->receiver()->ProcessAttach(info); content::RunAllPendingInMessageLoop(); diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc index b924116..9a7e007 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc @@ -101,7 +101,7 @@ void MediaGalleriesPrivateEventRouter::OnRemovableStorageAttached( pref_info.volume_metadata_valid = true; DeviceAttachmentDetails details; - details.device_name = UTF16ToUTF8(pref_info.GetGalleryDisplayName()); + details.device_name = base::UTF16ToUTF8(pref_info.GetGalleryDisplayName()); details.device_id = GetTransientIdForDeviceId(info.device_id()); scoped_ptr<base::ListValue> args(new base::ListValue()); diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index 3dcf12d..9f83c21 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -90,7 +90,7 @@ class MediaGalleriesPrivateGalleryWatchApiTest : public ExtensionApiTest { const std::string& ok_message) { ExtensionTestMessageListener listener(ok_message, false); host->ExecuteJavascriptInWebFrame(base::string16(), - ASCIIToUTF16(js_command)); + base::ASCIIToUTF16(js_command)); EXPECT_TRUE(listener.WaitUntilSatisfied()); } diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability.cc b/chrome/browser/extensions/api/messaging/incognito_connectability.cc index 09a8f05..14fb252 100644 --- a/chrome/browser/extensions/api/messaging/incognito_connectability.cc +++ b/chrome/browser/extensions/api/messaging/incognito_connectability.cc @@ -81,8 +81,8 @@ bool IncognitoConnectability::Query(const Extension* extension, : NULL, base::string16(), // no title l10n_util::GetStringFUTF16(template_id, - UTF8ToUTF16(origin.spec()), - UTF8ToUTF16(extension->name())), + base::UTF8ToUTF16(origin.spec()), + base::UTF8ToUTF16(extension->name())), chrome::MESSAGE_BOX_TYPE_QUESTION); break; } diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc index c47f041..4856627 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher_win.cc @@ -49,7 +49,7 @@ base::string16 GetManifestPath(const base::string16& native_host_name, base::FilePath NativeProcessLauncher::FindManifest( const std::string& native_host_name, std::string* error_message) { - base::string16 native_host_name_wide = UTF8ToUTF16(native_host_name); + base::string16 native_host_name_wide = base::UTF8ToUTF16(native_host_name); // First check 32-bit registry and then try 64-bit. base::string16 manifest_path_str = diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index b9d97d2..5b266e8 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -248,8 +248,8 @@ bool NotificationsApiFunction::CreateNotification( // Extract required fields: type, title, message, and icon. message_center::NotificationType type = MapApiTemplateTypeToType(options->type); - const base::string16 title(UTF8ToUTF16(*options->title)); - const base::string16 message(UTF8ToUTF16(*options->message)); + const base::string16 title(base::UTF8ToUTF16(*options->title)); + const base::string16 message(base::UTF8ToUTF16(*options->message)); gfx::Image icon; // TODO(dewittj): Return error if this fails. @@ -271,7 +271,7 @@ bool NotificationsApiFunction::CreateNotification( for (size_t i = 0; i < number_of_buttons; i++) { message_center::ButtonInfo info( - UTF8ToUTF16((*options->buttons)[i]->title)); + base::UTF8ToUTF16((*options->buttons)[i]->title)); NotificationBitmapToGfxImage((*options->buttons)[i]->icon_bitmap.get(), &info.icon); optional_fields.buttons.push_back(info); @@ -280,11 +280,13 @@ bool NotificationsApiFunction::CreateNotification( if (options->expanded_message.get()) { optional_fields.expanded_message = - UTF8ToUTF16(*options->expanded_message); + base::UTF8ToUTF16(*options->expanded_message); } - if (options->context_message) - optional_fields.context_message = UTF8ToUTF16(*options->context_message); + if (options->context_message) { + optional_fields.context_message = + base::UTF8ToUTF16(*options->context_message); + } bool has_image = NotificationBitmapToGfxImage(options->image_bitmap.get(), &optional_fields.image); @@ -315,8 +317,9 @@ bool NotificationsApiFunction::CreateNotification( using api::notifications::NotificationItem; std::vector<linked_ptr<NotificationItem> >::iterator i; for (i = options->items->begin(); i != options->items->end(); ++i) { - message_center::NotificationItem item(UTF8ToUTF16(i->get()->title), - UTF8ToUTF16(i->get()->message)); + message_center::NotificationItem item( + base::UTF8ToUTF16(i->get()->title), + base::UTF8ToUTF16(i->get()->message)); optional_fields.items.push_back(item); } } @@ -337,8 +340,8 @@ bool NotificationsApiFunction::CreateNotification( message_center::NotifierId( message_center::NotifierId::APPLICATION, extension_->id()), - UTF8ToUTF16(extension_->name()), - UTF8ToUTF16(api_delegate->id()), + base::UTF8ToUTF16(extension_->name()), + base::UTF8ToUTF16(api_delegate->id()), optional_fields, api_delegate); @@ -354,9 +357,9 @@ bool NotificationsApiFunction::UpdateNotification( if (options->type != api::notifications::TEMPLATE_TYPE_NONE) notification->set_type(MapApiTemplateTypeToType(options->type)); if (options->title) - notification->set_title(UTF8ToUTF16(*options->title)); + notification->set_title(base::UTF8ToUTF16(*options->title)); if (options->message) - notification->set_message(UTF8ToUTF16(*options->message)); + notification->set_message(base::UTF8ToUTF16(*options->message)); // TODO(dewittj): Return error if this fails. if (options->icon_bitmap) { @@ -380,7 +383,7 @@ bool NotificationsApiFunction::UpdateNotification( std::vector<message_center::ButtonInfo> buttons; for (size_t i = 0; i < number_of_buttons; i++) { message_center::ButtonInfo button( - UTF8ToUTF16((*options->buttons)[i]->title)); + base::UTF8ToUTF16((*options->buttons)[i]->title)); NotificationBitmapToGfxImage((*options->buttons)[i]->icon_bitmap.get(), &button.icon); buttons.push_back(button); @@ -388,12 +391,14 @@ bool NotificationsApiFunction::UpdateNotification( notification->set_buttons(buttons); } - if (options->context_message) - notification->set_context_message(UTF8ToUTF16(*options->context_message)); + if (options->context_message) { + notification->set_context_message( + base::UTF8ToUTF16(*options->context_message)); + } if (options->expanded_message) { notification->set_expanded_message( - UTF8ToUTF16(*options->expanded_message)); + base::UTF8ToUTF16(*options->expanded_message)); } gfx::Image image; @@ -428,8 +433,9 @@ bool NotificationsApiFunction::UpdateNotification( using api::notifications::NotificationItem; std::vector<linked_ptr<NotificationItem> >::iterator i; for (i = options->items->begin(); i != options->items->end(); ++i) { - message_center::NotificationItem item(UTF8ToUTF16(i->get()->title), - UTF8ToUTF16(i->get()->message)); + message_center::NotificationItem item( + base::UTF8ToUTF16(i->get()->title), + base::UTF8ToUTF16(i->get()->message)); items.push_back(item); } notification->set_items(items); diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc index 59d597f..286d0b7 100644 --- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc +++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc @@ -720,8 +720,8 @@ IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestPartialUpdate) { g_browser_process->message_center()->GetVisibleNotifications(); ASSERT_EQ(1u, notifications.size()); message_center::Notification* notification = *(notifications.begin()); - EXPECT_EQ(ASCIIToUTF16(kNewTitle), notification->title()); - EXPECT_EQ(ASCIIToUTF16(kNewMessage), notification->message()); + EXPECT_EQ(base::ASCIIToUTF16(kNewTitle), notification->title()); + EXPECT_EQ(base::ASCIIToUTF16(kNewMessage), notification->message()); EXPECT_EQ(kNewPriority, notification->priority()); EXPECT_EQ(0u, notification->buttons().size()); } diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index f1d7421..8380703 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -317,7 +317,7 @@ ACMatchClassifications StyleTypesToACMatchClassifications( const omnibox::SuggestResult &suggestion) { ACMatchClassifications match_classifications; if (suggestion.description_styles) { - base::string16 description = UTF8ToUTF16(suggestion.description); + base::string16 description = base::UTF8ToUTF16(suggestion.description); std::vector<int> styles(description.length(), 0); for (std::vector<linked_ptr<omnibox::SuggestResult::DescriptionStylesType> > @@ -377,10 +377,10 @@ void ApplyDefaultSuggestionForExtensionKeyword( if (!suggestion || suggestion->description.empty()) return; // fall back to the universal default - const base::string16 kPlaceholderText(ASCIIToUTF16("%s")); - const base::string16 kReplacementText(ASCIIToUTF16("<input>")); + const base::string16 kPlaceholderText(base::ASCIIToUTF16("%s")); + const base::string16 kReplacementText(base::ASCIIToUTF16("<input>")); - base::string16 description = UTF8ToUTF16(suggestion->description); + base::string16 description = base::UTF8ToUTF16(suggestion->description); ACMatchClassifications& description_styles = match->contents_class; description_styles = StyleTypesToACMatchClassifications(*suggestion); diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc index ef2b413..6042557 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc @@ -17,6 +17,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "ui/base/window_open_disposition.h" +using base::ASCIIToUTF16; + IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) { ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc index d8b68c2..164a2a9 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api_interactive_test.cc @@ -26,7 +26,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, PopupStaysClosed) { // Input a keyword query and wait for suggestions from the extension. omnibox_view->OnBeforePossibleChange(); - omnibox_view->SetUserText(ASCIIToUTF16("keyword comman")); + omnibox_view->SetUserText(base::ASCIIToUTF16("keyword comman")); omnibox_view->OnAfterPossibleChange(); WaitForAutocompleteDone(autocomplete_controller); EXPECT_TRUE(autocomplete_controller->done()); @@ -41,9 +41,10 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, PopupStaysClosed) { // directly, figure out how to send it via the proper calls to // location_bar or location_bar->(). autocomplete_controller->Start( - AutocompleteInput(ASCIIToUTF16("keyword command"), base::string16::npos, - base::string16(), GURL(), AutocompleteInput::NTP, - true, false, true, AutocompleteInput::ALL_MATCHES)); + AutocompleteInput(base::ASCIIToUTF16("keyword command"), + base::string16::npos, base::string16(), GURL(), + AutocompleteInput::NTP, true, false, true, + AutocompleteInput::ALL_MATCHES)); location_bar->AcceptInput(); WaitForAutocompleteDone(autocomplete_controller); EXPECT_TRUE(autocomplete_controller->done()); diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h b/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h index 169ca90..27029e9 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h @@ -49,11 +49,12 @@ class OmniboxApiTest : public ExtensionApiTest { for (size_t i = 0; i < result.size(); ++i) { AutocompleteMatch match = result.match_at(i); std::string provider_name = match.provider->GetName(); - output.append(base::StringPrintf("[\"%s\" by \"%s\"] ", - UTF16ToUTF8(match.contents).c_str(), - provider_name.c_str())); + output.append( + base::StringPrintf("[\"%s\" by \"%s\"] ", + base::UTF16ToUTF8(match.contents).c_str(), + provider_name.c_str())); } - return UTF8ToUTF16(output); + return base::UTF8ToUTF16(output); } }; diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc index 3f43260..c61d6ed 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api.cc @@ -65,10 +65,11 @@ void ProxyEventRouter::OnPACScriptError( net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED)); std::string error_msg; if (line_number != -1) { - base::SStringPrintf( - &error_msg, "line: %d: %s", line_number, UTF16ToUTF8(error).c_str()); + base::SStringPrintf(&error_msg, + "line: %d: %s", + line_number, base::UTF16ToUTF8(error).c_str()); } else { - error_msg = UTF16ToUTF8(error); + error_msg = base::UTF16ToUTF8(error); } dict->SetString(keys::kProxyEventDetails, error_msg); args->Append(dict); diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc index 69d9ccb..e9d0806 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc @@ -173,7 +173,7 @@ bool GetProxyServer(const base::DictionaryValue* proxy_server, *error = ErrorUtils::FormatErrorMessage( "Invalid 'rules.???.host' entry '*'. 'host' field supports only ASCII " "URLs (encode URLs in Punycode format).", - UTF16ToUTF8(host16)); + base::UTF16ToUTF8(host16)); return false; } std::string host = UTF16ToASCII(host16); diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc index f86684c..aa34756 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_canary_test.cc @@ -156,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(PushMessagingCanaryTest, MANUAL_ReceivesPush) { const std::string& client_secret = sync_setup_helper()->client_secret(); const std::string& refresh_token = sync_setup_helper()->refresh_token(); - const base::string16& script_string = UTF8ToUTF16(base::StringPrintf( + const base::string16& script_string = base::UTF8ToUTF16(base::StringPrintf( "startTestWithCredentials('%s', '%s', '%s');", client_id.c_str(), client_secret.c_str(), refresh_token.c_str())); diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc index 9bd68b1..2e45123 100644 --- a/chrome/browser/extensions/api/sessions/sessions_api.cc +++ b/chrome/browser/extensions/api/sessions/sessions_api.cc @@ -78,7 +78,7 @@ scoped_ptr<tabs::Tab> CreateTabModelHelper( scoped_ptr<tabs::Tab> tab_struct(new tabs::Tab); GURL gurl = current_navigation.virtual_url(); - std::string title = UTF16ToUTF8(current_navigation.title()); + std::string title = base::UTF16ToUTF8(current_navigation.title()); tab_struct->session_id.reset(new std::string(session_id)); tab_struct->url.reset(new std::string(gurl.spec())); @@ -87,7 +87,7 @@ scoped_ptr<tabs::Tab> CreateTabModelHelper( } else { const std::string languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages); - tab_struct->title.reset(new std::string(UTF16ToUTF8( + tab_struct->title.reset(new std::string(base::UTF16ToUTF8( net::FormatUrl(gurl, languages)))); } tab_struct->index = index; diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc index 6ed3b95..ea2f468 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc @@ -35,8 +35,8 @@ TemplateURLData ConvertSearchProvider( const ChromeSettingsOverrides::Search_provider& search_provider) { TemplateURLData data; - data.short_name = UTF8ToUTF16(search_provider.name); - data.SetKeyword(UTF8ToUTF16(search_provider.keyword)); + data.short_name = base::UTF8ToUTF16(search_provider.name); + data.SetKeyword(base::UTF8ToUTF16(search_provider.keyword)); data.SetURL(search_provider.search_url); if (search_provider.suggest_url) data.suggestions_url = *search_provider.suggest_url; diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc index 4c478ed..c647a5c 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc @@ -79,8 +79,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, OverrideSettings) { TemplateURL* extension_provider = url_service->GetDefaultSearchProvider(); EXPECT_EQ(TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, extension_provider->GetType()); - EXPECT_EQ(ASCIIToUTF16("name.de"), extension_provider->short_name()); - EXPECT_EQ(ASCIIToUTF16("keyword.de"), extension_provider->keyword()); + EXPECT_EQ(base::ASCIIToUTF16("name.de"), extension_provider->short_name()); + EXPECT_EQ(base::ASCIIToUTF16("keyword.de"), extension_provider->keyword()); EXPECT_EQ("http://www.foo.de/s?q={searchTerms}", extension_provider->url()); EXPECT_EQ(GURL("http://www.foo.de/favicon.ico"), extension_provider->favicon_url()); diff --git a/chrome/browser/extensions/api/system_display/display_info_provider_win.cc b/chrome/browser/extensions/api/system_display/display_info_provider_win.cc index f68de6a..ab8fd83 100644 --- a/chrome/browser/extensions/api/system_display/display_info_provider_win.cc +++ b/chrome/browser/extensions/api/system_display/display_info_provider_win.cc @@ -39,8 +39,9 @@ BOOL CALLBACK EnumMonitorCallback(HMONITOR monitor, return FALSE; gfx::Size dpi(gfx::GetDPI()); - unit->id = base::Int64ToString(base::Hash(WideToUTF8(monitor_info.szDevice))); - unit->name = WideToUTF8(device.DeviceString); + unit->id = base::Int64ToString( + base::Hash(base::WideToUTF8(monitor_info.szDevice))); + unit->name = base::WideToUTF8(device.DeviceString); unit->dpi_x = dpi.width(); unit->dpi_y = dpi.height(); all_displays->push_back(unit); diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index fc6e8b0..1950805 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -112,7 +112,7 @@ ExtensionIndicatorIcon::ExtensionIndicatorIcon(const Extension* extension, // used as the tool tip. gfx::ImageSkia icon_image = icon_factory_.GetIcon(ExtensionAction::kDefaultTabId).AsImageSkia(); - base::string16 tool_tip = UTF8ToUTF16(extension_->name()); + base::string16 tool_tip = base::UTF8ToUTF16(extension_->name()); icon_ = status_tray_->CreateStatusIcon( StatusTray::OTHER_ICON, icon_image, tool_tip); diff --git a/chrome/browser/extensions/api/system_storage/storage_api_test_util.cc b/chrome/browser/extensions/api/system_storage/storage_api_test_util.cc index 930efb3..3432768 100644 --- a/chrome/browser/extensions/api/system_storage/storage_api_test_util.cc +++ b/chrome/browser/extensions/api/system_storage/storage_api_test_util.cc @@ -17,7 +17,7 @@ StorageInfo BuildStorageInfoFromTestStorageUnitInfo( const TestStorageUnitInfo& unit) { return StorageInfo( unit.device_id, - UTF8ToUTF16(unit.name), + base::UTF8ToUTF16(unit.name), base::FilePath::StringType(), /* no location */ base::string16(), /* no storage label */ base::string16(), /* no storage vendor */ diff --git a/chrome/browser/extensions/api/system_storage/storage_info_provider.cc b/chrome/browser/extensions/api/system_storage/storage_info_provider.cc index 5cdc469..e045e80 100644 --- a/chrome/browser/extensions/api/system_storage/storage_info_provider.cc +++ b/chrome/browser/extensions/api/system_storage/storage_info_provider.cc @@ -24,7 +24,7 @@ void BuildStorageUnitInfo(const StorageInfo& info, StorageUnitInfo* unit) { unit->id = StorageMonitor::GetInstance()->GetTransientIdForDeviceId( info.device_id()); - unit->name = UTF16ToUTF8(info.name()); + unit->name = base::UTF16ToUTF8(info.name()); // TODO(hmin): Might need to take MTP device into consideration. unit->type = StorageInfo::IsRemovableDevice(info.device_id()) ? STORAGE_UNIT_TYPE_REMOVABLE : STORAGE_UNIT_TYPE_FIXED; diff --git a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc index 1e8e7ac..b4adbe0 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc @@ -51,7 +51,7 @@ class SystemStorageEjectApiTest : public ExtensionApiTest { const std::string& ok_message) { ExtensionTestMessageListener listener(ok_message, false); host->ExecuteJavascriptInWebFrame(base::string16(), - ASCIIToUTF16(js_command)); + base::ASCIIToUTF16(js_command)); EXPECT_TRUE(listener.WaitUntilSatisfied()); } diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 541ef9d..a6a9753 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -927,7 +927,7 @@ bool TabsQueryFunction::RunImpl() { } if (!title.empty() && !MatchPattern(web_contents->GetTitle(), - UTF8ToUTF16(title))) + base::UTF8ToUTF16(title))) continue; if (!url_pattern.MatchesURL(web_contents->GetURL())) diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index a2e53b1..191e2ef 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -203,7 +203,8 @@ class DelayLoadStartAndExecuteJavascript if (validated_url != delay_url_ || !rvh_) return; - rvh_->ExecuteJavascriptInWebFrame(base::string16(), UTF8ToUTF16(script_)); + rvh_->ExecuteJavascriptInWebFrame(base::string16(), + base::UTF8ToUTF16(script_)); script_was_executed_ = true; } diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index f3abdcb..e3f4f55 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -1183,7 +1183,7 @@ bool ExtensionWebRequestEventRouter::DispatchEvent( if (num_handlers_blocking == 0) { std::string delegate_info = l10n_util::GetStringFUTF8(IDS_LOAD_STATE_PARAMETER_EXTENSION, - UTF8ToUTF16((*it)->extension_name)); + base::UTF8ToUTF16((*it)->extension_name)); // LobAndReport allows extensions that block requests to be displayed in // the load status bar. request->LogAndReportBlockedBy(delegate_info.c_str()); @@ -1662,7 +1662,8 @@ scoped_ptr<base::DictionaryValue> SummarizeResponseDelta( } if (delta.auth_credentials) { details->SetString(activitylog::kAuthCredentialsKey, - UTF16ToUTF8(delta.auth_credentials->username()) + ":*"); + base::UTF16ToUTF8( + delta.auth_credentials->username()) + ":*"); } if (!delta.response_cookie_modifications.empty()) { @@ -1766,7 +1767,7 @@ void ExtensionWebRequestEventRouter::DecrementBlockCount( continue; std::string delegate_info = l10n_util::GetStringFUTF8(IDS_LOAD_STATE_PARAMETER_EXTENSION, - UTF8ToUTF16(it->extension_name)); + base::UTF8ToUTF16(it->extension_name)); blocked_request.request->LogAndReportBlockedBy(delegate_info.c_str()); break; } diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index fde07f9..9ee55a7 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -1295,8 +1295,8 @@ TEST(ExtensionWebRequestHelpersTest, TestCalculateOnHeadersReceivedDelta) { TEST(ExtensionWebRequestHelpersTest, TestCalculateOnAuthRequiredDelta) { const bool cancel = true; - base::string16 username = ASCIIToUTF16("foo"); - base::string16 password = ASCIIToUTF16("bar"); + base::string16 username = base::ASCIIToUTF16("foo"); + base::string16 password = base::ASCIIToUTF16("bar"); scoped_ptr<net::AuthCredentials> credentials( new net::AuthCredentials(username, password)); @@ -2068,9 +2068,9 @@ TEST(ExtensionWebRequestHelpersTest, TestMergeOnAuthRequiredResponses) { net::BoundNetLog net_log = capturing_net_log.bound(); ExtensionWarningSet warning_set; EventResponseDeltas deltas; - base::string16 username = ASCIIToUTF16("foo"); - base::string16 password = ASCIIToUTF16("bar"); - base::string16 password2 = ASCIIToUTF16("baz"); + base::string16 username = base::ASCIIToUTF16("foo"); + base::string16 password = base::ASCIIToUTF16("bar"); + base::string16 password2 = base::ASCIIToUTF16("baz"); // Check that we can handle if not returning credentials. linked_ptr<EventResponseDelta> d0( diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index 563efca..abb18c1 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc @@ -372,10 +372,10 @@ IN_PROC_BROWSER_TEST_F(HangoutServicesBrowserTest, ASSERT_TRUE(content::ExecuteScript(tab, "browsertestRunAllTests();")); - content::TitleWatcher title_watcher(tab, ASCIIToUTF16("success")); - title_watcher.AlsoWaitForTitle(ASCIIToUTF16("failure")); + content::TitleWatcher title_watcher(tab, base::ASCIIToUTF16("success")); + title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("failure")); base::string16 result = title_watcher.WaitAndGetTitle(); - EXPECT_EQ(ASCIIToUTF16("success"), result); + EXPECT_EQ(base::ASCIIToUTF16("success"), result); } #endif // defined(GOOGLE_CHROME_BUILD) diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index 925d235..d2b4757e 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -151,8 +151,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, DISABLED_FrameWebstorePageBlocked) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - base::string16 expected_title = UTF8ToUTF16("PASS: about:blank"); - base::string16 failure_title = UTF8ToUTF16("FAIL"); + base::string16 expected_title = base::UTF8ToUTF16("PASS: about:blank"); + base::string16 failure_title = base::UTF8ToUTF16("FAIL"); content::TitleWatcher watcher(contents, expected_title); watcher.AlsoWaitForTitle(failure_title); GURL url = test_server()->GetURL( @@ -168,8 +168,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, DISABLED_FrameErrorPageBlocked) { content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); - base::string16 expected_title = UTF8ToUTF16("PASS: about:blank"); - base::string16 failure_title = UTF8ToUTF16("FAIL"); + base::string16 expected_title = base::UTF8ToUTF16("PASS: about:blank"); + base::string16 failure_title = base::UTF8ToUTF16("FAIL"); content::TitleWatcher watcher(contents, expected_title); watcher.AlsoWaitForTitle(failure_title); GURL url = test_server()->GetURL( diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index aa14346..90db425 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -28,6 +28,7 @@ #include "base/mac/scoped_nsautorelease_pool.h" #endif +using base::ASCIIToUTF16; using extensions::Extension; class AppBackgroundPageApiTest : public ExtensionApiTest { diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index c09a3d2..181f409 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -19,12 +19,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) { ASSERT_EQ(size_before + 1, service->extensions()->size()); - EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur: l10n browser action").c_str(), + EXPECT_STREQ(base::WideToUTF8( + L"Hreggvi\u00F0ur: l10n browser action").c_str(), extension->description().c_str()); - EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur is my name").c_str(), + EXPECT_STREQ(base::WideToUTF8(L"Hreggvi\u00F0ur is my name").c_str(), extension->name().c_str()); int tab_id = ExtensionTabUtil::GetTabId( browser()->tab_strip_model()->GetActiveWebContents()); - EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur").c_str(), + EXPECT_STREQ(base::WideToUTF8(L"Hreggvi\u00F0ur").c_str(), extension->browser_action()->GetTitle(tab_id).c_str()); } diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc index 3b29cd5..88cf239 100644 --- a/chrome/browser/extensions/bundle_installer.cc +++ b/chrome/browser/extensions/bundle_installer.cc @@ -97,7 +97,7 @@ void BundleInstaller::SetAutoApproveForTesting(bool auto_approve) { BundleInstaller::Item::Item() : state(STATE_PENDING) {} base::string16 BundleInstaller::Item::GetNameForDisplay() { - base::string16 name = UTF8ToUTF16(localized_name); + base::string16 name = base::UTF8ToUTF16(localized_name); base::i18n::AdjustStringForLocaleDirection(&name); return l10n_util::GetStringFUTF16(IDS_EXTENSION_PERMISSION_LINE, name); } diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc index 6f03d6a..28f3449 100644 --- a/chrome/browser/extensions/context_menu_matcher.cc +++ b/chrome/browser/extensions/context_menu_matcher.cc @@ -65,7 +65,7 @@ void ContextMenuMatcher::AppendExtensionItems( MenuItem::List submenu_items; if (items.size() > 1 || items[0]->type() != MenuItem::NORMAL) { - title = UTF8ToUTF16(extension->name()); + title = base::UTF8ToUTF16(extension->name()); submenu_items = items; } else { MenuItem* item = items[0]; @@ -109,7 +109,7 @@ base::string16 ContextMenuMatcher::GetTopLevelContextMenuTitle( if (items.empty() || items.size() > 1 || items[0]->type() != MenuItem::NORMAL) { - title = UTF8ToUTF16(extension->name()); + title = base::UTF8ToUTF16(extension->name()); } else { MenuItem* item = items[0]; title = item->TitleWithReplacement( diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 0aa8910..933bcc5 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -35,32 +35,33 @@ scoped_refptr<Extension> ConvertUserScriptToExtension( const base::FilePath& extensions_dir, base::string16* error) { std::string content; if (!base::ReadFileToString(user_script_path, &content)) { - *error = ASCIIToUTF16("Could not read source file."); + *error = base::ASCIIToUTF16("Could not read source file."); return NULL; } if (!IsStringUTF8(content)) { - *error = ASCIIToUTF16("User script must be UTF8 encoded."); + *error = base::ASCIIToUTF16("User script must be UTF8 encoded."); return NULL; } UserScript script; if (!UserScriptMaster::ScriptReloader::ParseMetadataHeader(content, &script)) { - *error = ASCIIToUTF16("Invalid script header."); + *error = base::ASCIIToUTF16("Invalid script header."); return NULL; } base::FilePath install_temp_dir = extension_file_util::GetInstallTempDir(extensions_dir); if (install_temp_dir.empty()) { - *error = ASCIIToUTF16("Could not get path to profile temporary directory."); + *error = base::ASCIIToUTF16( + "Could not get path to profile temporary directory."); return NULL; } base::ScopedTempDir temp_dir; if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) { - *error = ASCIIToUTF16("Could not create temporary directory."); + *error = base::ASCIIToUTF16("Could not create temporary directory."); return NULL; } @@ -159,14 +160,14 @@ scoped_refptr<Extension> ConvertUserScriptToExtension( base::FilePath manifest_path = temp_dir.path().Append(kManifestFilename); JSONFileValueSerializer serializer(manifest_path); if (!serializer.Serialize(*root)) { - *error = ASCIIToUTF16("Could not write JSON."); + *error = base::ASCIIToUTF16("Could not write JSON."); return NULL; } // Write the script file. if (!base::CopyFile(user_script_path, temp_dir.path().AppendASCII("script.js"))) { - *error = ASCIIToUTF16("Could not copy script file."); + *error = base::ASCIIToUTF16("Could not copy script file."); return NULL; } @@ -179,7 +180,7 @@ scoped_refptr<Extension> ConvertUserScriptToExtension( *root, Extension::NO_FLAGS, &utf8_error); - *error = UTF8ToUTF16(utf8_error); + *error = base::UTF8ToUTF16(utf8_error); if (!extension.get()) { NOTREACHED() << "Could not init extension " << *error; return NULL; diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index 9b45d2b..e5da419 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -149,7 +149,7 @@ TEST_F(ExtensionFromUserScript, NotUTF8) { extensions_dir.path(), &error)); ASSERT_FALSE(extension.get()); - EXPECT_EQ(ASCIIToUTF16("User script must be UTF8 encoded."), error); + EXPECT_EQ(base::ASCIIToUTF16("User script must be UTF8 encoded."), error); } TEST_F(ExtensionFromUserScript, RunAtDocumentStart) { diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 54fe5dd..a324976 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -111,9 +111,9 @@ scoped_refptr<Extension> ConvertWebAppToExtension( if (web_app.is_offline_enabled) root->SetBoolean(keys::kOfflineEnabled, true); - root->SetString(keys::kName, UTF16ToUTF8(web_app.title)); + root->SetString(keys::kName, base::UTF16ToUTF8(web_app.title)); root->SetString(keys::kVersion, ConvertTimeToExtensionVersion(create_time)); - root->SetString(keys::kDescription, UTF16ToUTF8(web_app.description)); + root->SetString(keys::kDescription, base::UTF16ToUTF8(web_app.description)); root->SetString(keys::kLaunchWebURL, web_app.app_url.spec()); if (!web_app.launch_container.empty()) diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index f2e550d..fcf8f9f 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -99,8 +99,9 @@ TEST(ExtensionFromWebApp, Basic) { WebApplicationInfo web_app; web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json"); - web_app.title = ASCIIToUTF16("Gearpad"); - web_app.description = ASCIIToUTF16("The best text editor in the universe!"); + web_app.title = base::ASCIIToUTF16("Gearpad"); + web_app.description = + base::ASCIIToUTF16("The best text editor in the universe!"); web_app.app_url = GURL("http://aaronboodman.com/gearpad/"); web_app.permissions.push_back("geolocation"); web_app.permissions.push_back("notifications"); @@ -129,8 +130,8 @@ TEST(ExtensionFromWebApp, Basic) { extension->public_key()); EXPECT_EQ("ncnbaadanljoanockmphfdkimpdedemj", extension->id()); EXPECT_EQ("1978.12.11.0", extension->version()->GetString()); - EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name()); - EXPECT_EQ(UTF16ToUTF8(web_app.description), extension->description()); + EXPECT_EQ(base::UTF16ToUTF8(web_app.title), extension->name()); + EXPECT_EQ(base::UTF16ToUTF8(web_app.description), extension->description()); EXPECT_EQ(web_app.app_url, AppLaunchInfo::GetFullLaunchURL(extension.get())); EXPECT_EQ(2u, extension->GetActivePermissions()->apis().size()); EXPECT_TRUE(extension->HasAPIPermission("geolocation")); @@ -160,7 +161,7 @@ TEST(ExtensionFromWebApp, Minimal) { WebApplicationInfo web_app; web_app.manifest_url = GURL("http://aaronboodman.com/gearpad/manifest.json"); - web_app.title = ASCIIToUTF16("Gearpad"); + web_app.title = base::ASCIIToUTF16("Gearpad"); web_app.app_url = GURL("http://aaronboodman.com/gearpad/"); scoped_refptr<Extension> extension = ConvertWebAppToExtension( @@ -179,7 +180,7 @@ TEST(ExtensionFromWebApp, Minimal) { extension->public_key()); EXPECT_EQ("ncnbaadanljoanockmphfdkimpdedemj", extension->id()); EXPECT_EQ("1978.12.11.0", extension->version()->GetString()); - EXPECT_EQ(UTF16ToUTF8(web_app.title), extension->name()); + EXPECT_EQ(base::UTF16ToUTF8(web_app.title), extension->name()); EXPECT_EQ("", extension->description()); EXPECT_EQ(web_app.app_url, AppLaunchInfo::GetFullLaunchURL(extension.get())); EXPECT_EQ(0u, IconsInfo::GetIcons(extension.get()).map().size()); diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 5516970..b4189a6 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -255,8 +255,8 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) { expected_id_ != extension->id()) { return CrxInstallerError( l10n_util::GetStringFUTF16(IDS_EXTENSION_INSTALL_UNEXPECTED_ID, - ASCIIToUTF16(expected_id_), - ASCIIToUTF16(extension->id()))); + base::ASCIIToUTF16(expected_id_), + base::ASCIIToUTF16(extension->id()))); } if (expected_version_.get()) { @@ -265,16 +265,16 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) { return CrxInstallerError( l10n_util::GetStringFUTF16( IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION, - ASCIIToUTF16(expected_version_->GetString()), - ASCIIToUTF16(extension->version()->GetString()))); + base::ASCIIToUTF16(expected_version_->GetString()), + base::ASCIIToUTF16(extension->version()->GetString()))); } } else { if (extension->version()->CompareTo(*expected_version_) < 0) { return CrxInstallerError( l10n_util::GetStringFUTF16( IDS_EXTENSION_INSTALL_UNEXPECTED_VERSION, - ASCIIToUTF16(expected_version_->GetString() + "+"), - ASCIIToUTF16(extension->version()->GetString()))); + base::ASCIIToUTF16(expected_version_->GetString() + "+"), + base::ASCIIToUTF16(extension->version()->GetString()))); } } } @@ -377,7 +377,7 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) { return CrxInstallerError( l10n_util::GetStringFUTF16( IDS_EXTENSION_INSTALL_INCORRECT_APP_CONTENT_TYPE, - ASCIIToUTF16(Extension::kMimeType))); + base::ASCIIToUTF16(Extension::kMimeType))); } // If the client_ is NULL, then the app is either being installed via @@ -490,7 +490,7 @@ void CrxInstaller::CheckImportsAndRequirements() { ReportFailureFromUIThread( CrxInstallerError(l10n_util::GetStringFUTF16( IDS_EXTENSION_INSTALL_DEPENDENCY_NOT_SHARED_MODULE, - ASCIIToUTF16(i->extension_id)))); + base::ASCIIToUTF16(i->extension_id)))); return; } } @@ -508,7 +508,7 @@ void CrxInstaller::OnRequirementsChecked( if (!requirement_errors.empty()) { if (error_on_unsupported_requirements_) { ReportFailureFromUIThread(CrxInstallerError( - UTF8ToUTF16(JoinString(requirement_errors, ' ')))); + base::UTF8ToUTF16(JoinString(requirement_errors, ' ')))); return; } has_requirement_errors_ = true; @@ -534,7 +534,7 @@ void CrxInstaller::OnBlacklistChecked( // refuse to install it. ReportFailureFromUIThread(extensions::CrxInstallerError( l10n_util::GetStringFUTF16(IDS_EXTENSION_IS_BLACKLISTED, - UTF8ToUTF16(extension()->name())))); + base::UTF8ToUTF16(extension()->name())))); UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlockCRX", extension()->location(), Manifest::NUM_LOCATIONS); @@ -591,7 +591,7 @@ void CrxInstaller::ConfirmInstall() { CrxInstallerError( l10n_util::GetStringFUTF16( IDS_EXTENSION_OVERLAPPING_WEB_EXTENT, - UTF8ToUTF16(overlapping_extension->name())))); + base::UTF8ToUTF16(overlapping_extension->name())))); return; } @@ -710,7 +710,7 @@ void CrxInstaller::CompleteInstall() { ReportSuccessFromFileThread(); } else { LOG(ERROR) << error << " " << extension_id << " " << download_url_; - ReportFailureFromFileThread(CrxInstallerError(UTF8ToUTF16(error))); + ReportFailureFromFileThread(CrxInstallerError(base::UTF8ToUTF16(error))); } } diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc index 27c549b..fbdef80 100644 --- a/chrome/browser/extensions/error_console/error_console_browsertest.cc +++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc @@ -47,8 +47,8 @@ const StackTrace& GetStackTraceFromError(const ExtensionError* error) { void CheckStackFrame(const StackFrame& frame, const std::string& source, const std::string& function) { - EXPECT_EQ(UTF8ToUTF16(source), frame.source); - EXPECT_EQ(UTF8ToUTF16(function), frame.function); + EXPECT_EQ(base::UTF8ToUTF16(source), frame.source); + EXPECT_EQ(base::UTF8ToUTF16(function), frame.function); } // Verify that all properties of a given |frame| are correct. Overloaded because @@ -74,9 +74,9 @@ void CheckError(const ExtensionError* error, ASSERT_TRUE(error); EXPECT_EQ(type, error->type()); EXPECT_EQ(id, error->extension_id()); - EXPECT_EQ(UTF8ToUTF16(source), error->source()); + EXPECT_EQ(base::UTF8ToUTF16(source), error->source()); EXPECT_EQ(from_incognito, error->from_incognito()); - EXPECT_EQ(UTF8ToUTF16(message), error->message()); + EXPECT_EQ(base::UTF8ToUTF16(message), error->message()); } // Verify that all properties of a JS runtime error are correct. @@ -116,8 +116,8 @@ void CheckManifestError(const ExtensionError* error, const ManifestError* manifest_error = static_cast<const ManifestError*>(error); - EXPECT_EQ(UTF8ToUTF16(manifest_key), manifest_error->manifest_key()); - EXPECT_EQ(UTF8ToUTF16(manifest_specific), + EXPECT_EQ(base::UTF8ToUTF16(manifest_key), manifest_error->manifest_key()); + EXPECT_EQ(base::UTF8ToUTF16(manifest_specific), manifest_error->manifest_specific()); } @@ -295,7 +295,7 @@ IN_PROC_BROWSER_TEST_F(ErrorConsoleBrowserTest, ReportManifestErrors) { const char kFakeKey[] = "not_a_real_key"; for (size_t i = 0; i < errors.size(); ++i) { ASSERT_EQ(ExtensionError::MANIFEST_ERROR, errors[i]->type()); - std::string utf8_key = UTF16ToUTF8( + std::string utf8_key = base::UTF16ToUTF8( (static_cast<const ManifestError*>(errors[i]))->manifest_key()); if (utf8_key == manifest_keys::kPermissions) permissions_error = errors[i]; diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 77bd71f..2585602 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -205,8 +205,8 @@ class ExtensionContextMenuBrowserTest : public ExtensionBrowserTest { } bool MenuHasExtensionItemWithLabel(TestRenderViewContextMenu* menu, - const std::string& label) { - base::string16 label16 = UTF8ToUTF16(label); + const std::string& label) { + base::string16 label16 = base::UTF8ToUTF16(label); std::map<int, MenuItem::Id>::iterator i; for (i = menu->extension_items().extension_item_map_.begin(); i != menu->extension_items().extension_item_map_.end(); ++i) { @@ -391,16 +391,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, MAYBE_TopLevel) { ASSERT_TRUE(menu->GetMenuModelAndItemIndex( IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST, &model, &index)); - EXPECT_EQ(UTF8ToUTF16("An Extension with multiple Context Menus"), - model->GetLabelAt(index++)); - EXPECT_EQ(UTF8ToUTF16("Context Menu #1 - Extension #2"), - model->GetLabelAt(index++)); - EXPECT_EQ(UTF8ToUTF16("Context Menu #2 - Extension #3"), - model->GetLabelAt(index++)); - EXPECT_EQ(UTF8ToUTF16("Context Menu #3 - Extension #1"), - model->GetLabelAt(index++)); - EXPECT_EQ(UTF8ToUTF16("Ze Extension with multiple Context Menus"), - model->GetLabelAt(index++)); + EXPECT_EQ(base::UTF8ToUTF16("An Extension with multiple Context Menus"), + model->GetLabelAt(index++)); + EXPECT_EQ(base::UTF8ToUTF16("Context Menu #1 - Extension #2"), + model->GetLabelAt(index++)); + EXPECT_EQ(base::UTF8ToUTF16("Context Menu #2 - Extension #3"), + model->GetLabelAt(index++)); + EXPECT_EQ(base::UTF8ToUTF16("Context Menu #3 - Extension #1"), + model->GetLabelAt(index++)); + EXPECT_EQ(base::UTF8ToUTF16("Ze Extension with multiple Context Menus"), + model->GetLabelAt(index++)); } // Checks that in |menu|, the item at |index| has type |expected_type| and a @@ -410,7 +410,7 @@ static void ExpectLabelAndType(const char* expected_label, const MenuModel& menu, int index) { EXPECT_EQ(expected_type, menu.GetTypeAt(index)); - EXPECT_EQ(UTF8ToUTF16(expected_label), menu.GetLabelAt(index)); + EXPECT_EQ(base::UTF8ToUTF16(expected_label), menu.GetLabelAt(index)); } // In the separators test we build a submenu with items and separators in two @@ -476,7 +476,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, Separators) { base::string16 label; ASSERT_TRUE(menu->GetMenuModelAndItemIndex( IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST, &model, &index)); - EXPECT_EQ(UTF8ToUTF16(extension->name()), model->GetLabelAt(index)); + EXPECT_EQ(base::UTF8ToUTF16(extension->name()), model->GetLabelAt(index)); ASSERT_EQ(MenuModel::TYPE_SUBMENU, model->GetTypeAt(index)); // Get the submenu and verify the items there. @@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionContextMenuBrowserTest, Separators) { menu.reset(CreateMenu(browser(), url, GURL(), GURL())); ASSERT_TRUE(menu->GetMenuModelAndItemIndex( IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST, &model, &index)); - EXPECT_EQ(UTF8ToUTF16("parent"), model->GetLabelAt(index)); + EXPECT_EQ(base::UTF8ToUTF16("parent"), model->GetLabelAt(index)); submenu = model->GetSubmenuModelAt(index); ASSERT_TRUE(submenu != NULL); VerifyMenuForSeparatorsTest(*submenu); diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 0a578b9..c2addc1 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -170,7 +170,7 @@ void ExtensionContextMenuModel::InitMenu(const Extension* extension) { // Ampersands need to be escaped to avoid being treated like // mnemonics in the menu. base::ReplaceChars(extension_name, "&", "&&", &extension_name); - AddItem(NAME, UTF8ToUTF16(extension_name)); + AddItem(NAME, base::UTF8ToUTF16(extension_name)); AddSeparator(ui::NORMAL_SEPARATOR); AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS_MENU_ITEM); AddItem(UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL)); diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index 32b540321..b4fb4fb 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -236,7 +236,7 @@ int ExtensionDisabledGlobalError::MenuItemCommandID() { base::string16 ExtensionDisabledGlobalError::MenuItemLabel() { return l10n_util::GetStringFUTF16(IDS_EXTENSION_DISABLED_ERROR_TITLE, - UTF8ToUTF16(extension_->name())); + base::UTF8ToUTF16(extension_->name())); } void ExtensionDisabledGlobalError::ExecuteMenuItem(Browser* browser) { @@ -249,7 +249,7 @@ gfx::Image ExtensionDisabledGlobalError::GetBubbleViewIcon() { base::string16 ExtensionDisabledGlobalError::GetBubbleViewTitle() { return l10n_util::GetStringFUTF16(IDS_EXTENSION_DISABLED_ERROR_TITLE, - UTF8ToUTF16(extension_->name())); + base::UTF8ToUTF16(extension_->name())); } std::vector<base::string16> @@ -258,7 +258,7 @@ ExtensionDisabledGlobalError::GetBubbleViewMessages() { messages.push_back(l10n_util::GetStringFUTF16( extension_->is_app() ? IDS_APP_DISABLED_ERROR_LABEL : IDS_EXTENSION_DISABLED_ERROR_LABEL, - UTF8ToUTF16(extension_->name()))); + base::UTF8ToUTF16(extension_->name()))); messages.push_back(l10n_util::GetStringUTF16( IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO)); std::vector<base::string16> permission_warnings = diff --git a/chrome/browser/extensions/extension_error_reporter.cc b/chrome/browser/extensions/extension_error_reporter.cc index dcbe45f..eb9b595 100644 --- a/chrome/browser/extensions/extension_error_reporter.cc +++ b/chrome/browser/extensions/extension_error_reporter.cc @@ -56,7 +56,7 @@ void ExtensionErrorReporter::ReportError(const base::string16& message, LOG(WARNING) << "Extension error: " << message; if (enable_noisy_errors_ && be_noisy) { - chrome::ShowMessageBox(NULL, ASCIIToUTF16("Extension error"), message, + chrome::ShowMessageBox(NULL, base::ASCIIToUTF16("Extension error"), message, chrome::MESSAGE_BOX_TYPE_WARNING); } } diff --git a/chrome/browser/extensions/extension_error_ui.cc b/chrome/browser/extensions/extension_error_ui.cc index d908812..9dca279 100644 --- a/chrome/browser/extensions/extension_error_ui.cc +++ b/chrome/browser/extensions/extension_error_ui.cc @@ -48,7 +48,7 @@ base::string16 ExtensionErrorUI::GenerateMessageSection( extension_service_->GetInstalledExtension(*iter); message += l10n_util::GetStringFUTF16( e->is_app() ? app_template_message_id : extension_template_message_id, - UTF8ToUTF16(e->name())) + char16('\n'); + base::UTF8ToUTF16(e->name())) + char16('\n'); } return message; } diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index db6c471..c104f97 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -246,7 +246,7 @@ void ExtensionInstallPrompt::Prompt::SetOAuthIssueAdvice( void ExtensionInstallPrompt::Prompt::SetUserNameFromProfile(Profile* profile) { // |profile| can be NULL in unit tests. if (profile) { - oauth_user_name_ = UTF8ToUTF16(profile->GetPrefs()->GetString( + oauth_user_name_ = base::UTF8ToUTF16(profile->GetPrefs()->GetString( prefs::kGoogleServicesUsername)); } else { oauth_user_name_.clear(); @@ -277,7 +277,7 @@ base::string16 ExtensionInstallPrompt::Prompt::GetDialogTitle() const { resource_id = IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE; } else if (type_ == EXTERNAL_INSTALL_PROMPT) { return l10n_util::GetStringFUTF16( - resource_id, UTF8ToUTF16(extension_->name())); + resource_id, base::UTF8ToUTF16(extension_->name())); } return l10n_util::GetStringUTF16(resource_id); @@ -285,7 +285,7 @@ base::string16 ExtensionInstallPrompt::Prompt::GetDialogTitle() const { base::string16 ExtensionInstallPrompt::Prompt::GetHeading() const { if (type_ == INLINE_INSTALL_PROMPT) { - return UTF8ToUTF16(extension_->name()); + return base::UTF8ToUTF16(extension_->name()); } else if (type_ == BUNDLE_INSTALL_PROMPT) { return bundle_->GetHeadingTextFor(BundleInstaller::Item::STATE_PENDING); } else if (type_ == EXTERNAL_INSTALL_PROMPT) { @@ -299,7 +299,7 @@ base::string16 ExtensionInstallPrompt::Prompt::GetHeading() const { return l10n_util::GetStringUTF16(resource_id); } else { return l10n_util::GetStringFUTF16( - kHeadingIds[type_], UTF8ToUTF16(extension_->name())); + kHeadingIds[type_], base::UTF8ToUTF16(extension_->name())); } } diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc index 1cf7e4f..895dc78 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller.cc @@ -55,10 +55,10 @@ ExtensionMessageBubbleController::GetExtensionList() { it != list->end(); ++it) { const Extension* extension = service_->GetInstalledExtension(*it); if (extension) { - return_value.push_back(UTF8ToUTF16(extension->name())); + return_value.push_back(base::UTF8ToUTF16(extension->name())); } else { return_value.push_back( - ASCIIToUTF16(std::string("(unknown name) ") + *it)); + base::ASCIIToUTF16(std::string("(unknown name) ") + *it)); // TODO(finnur): Add this as a string to the grd, for next milestone. } } diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc index 169b45a..dbefb7b 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc @@ -277,7 +277,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_WipeoutControllerTest) { EXPECT_TRUE(controller->ShouldShow()); suspicious_extensions = controller->GetExtensionList(); ASSERT_EQ(1U, suspicious_extensions.size()); - EXPECT_TRUE(ASCIIToUTF16("Extension 1") == suspicious_extensions[0]); + EXPECT_TRUE(base::ASCIIToUTF16("Extension 1") == suspicious_extensions[0]); controller->Show(&bubble); // Simulate showing the bubble. EXPECT_EQ(0U, controller->link_click_count()); EXPECT_EQ(1U, controller->dismiss_click_count()); @@ -299,8 +299,8 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_WipeoutControllerTest) { EXPECT_TRUE(controller->ShouldShow()); suspicious_extensions = controller->GetExtensionList(); ASSERT_EQ(2U, suspicious_extensions.size()); - EXPECT_TRUE(ASCIIToUTF16("Extension 1") == suspicious_extensions[1]); - EXPECT_TRUE(ASCIIToUTF16("Extension 2") == suspicious_extensions[0]); + EXPECT_TRUE(base::ASCIIToUTF16("Extension 1") == suspicious_extensions[1]); + EXPECT_TRUE(base::ASCIIToUTF16("Extension 2") == suspicious_extensions[0]); controller->Show(&bubble); // Simulate showing the bubble. EXPECT_EQ(1U, controller->link_click_count()); EXPECT_EQ(0U, controller->dismiss_click_count()); @@ -329,8 +329,8 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_DevModeControllerTest) { std::vector<base::string16> dev_mode_extensions = controller->GetExtensionList(); ASSERT_EQ(2U, dev_mode_extensions.size()); - EXPECT_TRUE(ASCIIToUTF16("Extension 2") == dev_mode_extensions[0]); - EXPECT_TRUE(ASCIIToUTF16("Extension 1") == dev_mode_extensions[1]); + EXPECT_TRUE(base::ASCIIToUTF16("Extension 2") == dev_mode_extensions[0]); + EXPECT_TRUE(base::ASCIIToUTF16("Extension 1") == dev_mode_extensions[1]); EXPECT_EQ(0U, controller->link_click_count()); EXPECT_EQ(0U, controller->dismiss_click_count()); EXPECT_EQ(0U, controller->action_click_count()); diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 7617254..ee9f6c3 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -2500,8 +2500,8 @@ void ExtensionService::ReportExtensionLoadError( content::Source<Profile>(profile_), content::Details<const std::string>(&error)); - std::string path_str = UTF16ToUTF8(extension_path.LossyDisplayName()); - base::string16 message = UTF8ToUTF16(base::StringPrintf( + std::string path_str = base::UTF16ToUTF8(extension_path.LossyDisplayName()); + base::string16 message = base::UTF8ToUTF16(base::StringPrintf( "Could not load extension from '%s'. %s", path_str.c_str(), error.c_str())); ExtensionErrorReporter::GetInstance()->ReportError(message, be_noisy); diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 2dbf5c7..bf5bed9 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -193,7 +193,7 @@ static std::vector<base::string16> GetErrors() { for (std::vector<base::string16>::const_iterator iter = errors->begin(); iter != errors->end(); ++iter) { - std::string utf8_error = UTF16ToUTF8(*iter); + std::string utf8_error = base::UTF16ToUTF8(*iter); if (utf8_error.find(".svn") == std::string::npos) { ret_val.push_back(*iter); } @@ -1436,25 +1436,25 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) { ASSERT_EQ(4u, GetErrors().size()); ASSERT_EQ(0u, loaded_.size()); - EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[0]), + EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[0]), std::string("Could not load extension from '*'. ") + extensions::manifest_errors::kManifestUnreadable)) << - UTF16ToUTF8(GetErrors()[0]); + base::UTF16ToUTF8(GetErrors()[0]); - EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[1]), + EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[1]), std::string("Could not load extension from '*'. ") + extensions::manifest_errors::kManifestUnreadable)) << - UTF16ToUTF8(GetErrors()[1]); + base::UTF16ToUTF8(GetErrors()[1]); - EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[2]), + EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[2]), std::string("Could not load extension from '*'. ") + extensions::manifest_errors::kMissingFile)) << - UTF16ToUTF8(GetErrors()[2]); + base::UTF16ToUTF8(GetErrors()[2]); - EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[3]), + EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[3]), std::string("Could not load extension from '*'. ") + extensions::manifest_errors::kManifestUnreadable)) << - UTF16ToUTF8(GetErrors()[3]); + base::UTF16ToUTF8(GetErrors()[3]); }; // Test that partially deleted extensions are cleaned up during startup @@ -4275,8 +4275,8 @@ TEST_F(ExtensionServiceTest, ClearExtensionData) { webkit_database::DatabaseTracker* db_tracker = BrowserContext::GetDefaultStoragePartition(profile_.get())-> GetDatabaseTracker(); - base::string16 db_name = UTF8ToUTF16("db"); - base::string16 description = UTF8ToUTF16("db_description"); + base::string16 db_name = base::UTF8ToUTF16("db"); + base::string16 description = base::UTF8ToUTF16("db_description"); int64 size; db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); db_tracker->DatabaseClosed(origin_id, db_name); @@ -4391,8 +4391,8 @@ TEST_F(ExtensionServiceTest, ClearAppData) { webkit_database::DatabaseTracker* db_tracker = BrowserContext::GetDefaultStoragePartition(profile_.get())-> GetDatabaseTracker(); - base::string16 db_name = UTF8ToUTF16("db"); - base::string16 description = UTF8ToUTF16("db_description"); + base::string16 db_name = base::UTF8ToUTF16("db"); + base::string16 description = base::UTF8ToUTF16("db_description"); int64 size; db_tracker->DatabaseOpened(origin_id, db_name, description, 1, &size); db_tracker->DatabaseClosed(origin_id, db_name); @@ -4539,8 +4539,9 @@ TEST_F(ExtensionServiceTest, UnpackedValidatesLocales) { base::FilePath ms_messages_file = bad_locale.AppendASCII("_locales") .AppendASCII("ms") .AppendASCII("messages.json"); - EXPECT_THAT(UTF16ToUTF8(GetErrors()[0]), testing::AllOf( - testing::HasSubstr(UTF16ToUTF8(ms_messages_file.LossyDisplayName())), + EXPECT_THAT(base::UTF16ToUTF8(GetErrors()[0]), testing::AllOf( + testing::HasSubstr( + base::UTF16ToUTF8(ms_messages_file.LossyDisplayName())), testing::HasSubstr("Dictionary keys must be quoted."))); ASSERT_EQ(0u, loaded_.size()); } diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index 240dab5..6f36384 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -33,7 +33,7 @@ class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest { protected: std::string GetLocationBarText() const { - return UTF16ToUTF8( + return base::UTF16ToUTF8( browser()->window()->GetLocationBar()->GetOmniboxView()->GetText()); } diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index 1c4df71..a58fe84 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -165,9 +165,10 @@ ExtensionWarning ExtensionWarning::CreateDownloadFilenameConflictWarning( const base::FilePath& losing_filename, const base::FilePath& winning_filename) { std::vector<std::string> message_parameters; - message_parameters.push_back(UTF16ToUTF8(losing_filename.LossyDisplayName())); + message_parameters.push_back(base::UTF16ToUTF8( + losing_filename.LossyDisplayName())); message_parameters.push_back(kTranslate + winning_extension_id); - message_parameters.push_back(UTF16ToUTF8( + message_parameters.push_back(base::UTF16ToUTF8( winning_filename.LossyDisplayName())); return ExtensionWarning( kDownloadFilenameConflict, @@ -192,7 +193,7 @@ std::string ExtensionWarning::GetLocalizedMessage( extensions->GetByID(extension_id); message = extension ? extension->name() : extension_id; } - final_parameters.push_back(UTF8ToUTF16(net::EscapeForHTML(message))); + final_parameters.push_back(base::UTF8ToUTF16(net::EscapeForHTML(message))); } COMPILE_ASSERT(kMaxNumberOfParameters == 4u, YouNeedToAddMoreCaseStatements); diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc index d723182..7d4936b 100644 --- a/chrome/browser/extensions/external_install_ui.cc +++ b/chrome/browser/extensions/external_install_ui.cc @@ -271,7 +271,7 @@ base::string16 ExternalInstallMenuAlert::MenuItemLabel() { id = IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_THEME; else id = IDS_EXTENSION_EXTERNAL_INSTALL_ALERT_EXTENSION; - return l10n_util::GetStringFUTF16(id, UTF8ToUTF16(extension_->name())); + return l10n_util::GetStringFUTF16(id, base::UTF8ToUTF16(extension_->name())); } void ExternalInstallMenuAlert::ExecuteMenuItem(Browser* browser) { diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index 81b68e6..27461af 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc @@ -41,7 +41,7 @@ std::set<base::FilePath> GetPrefsCandidateFilesFromFolder( false, // Recursive. base::FileEnumerator::FILES); #if defined(OS_WIN) - base::FilePath::StringType extension = UTF8ToWide(std::string(".json")); + base::FilePath::StringType extension = base::UTF8ToWide(std::string(".json")); #elif defined(OS_POSIX) base::FilePath::StringType extension(".json"); #endif diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index c6ee0ad..95eab90 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -59,11 +59,11 @@ void ExternalRegistryLoader::LoadOnFileThread() { // A map of IDs, to weed out duplicates between HKCU and HKLM. std::set<base::string16> keys; base::win::RegistryKeyIterator iterator_machine_key( - HKEY_LOCAL_MACHINE, ASCIIToWide(kRegistryExtensions).c_str()); + HKEY_LOCAL_MACHINE, base::ASCIIToWide(kRegistryExtensions).c_str()); for (; iterator_machine_key.Valid(); ++iterator_machine_key) keys.insert(iterator_machine_key.Name()); base::win::RegistryKeyIterator iterator_user_key( - HKEY_CURRENT_USER, ASCIIToWide(kRegistryExtensions).c_str()); + HKEY_CURRENT_USER, base::ASCIIToWide(kRegistryExtensions).c_str()); for (; iterator_user_key.Valid(); ++iterator_user_key) keys.insert(iterator_user_key.Name()); @@ -73,7 +73,7 @@ void ExternalRegistryLoader::LoadOnFileThread() { for (std::set<base::string16>::const_iterator it = keys.begin(); it != keys.end(); ++it) { base::win::RegKey key; - base::string16 key_path = ASCIIToWide(kRegistryExtensions); + base::string16 key_path = base::ASCIIToWide(kRegistryExtensions); key_path.append(L"\\"); key_path.append(*it); if (key.Open(HKEY_LOCAL_MACHINE, diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 4020ed7..10943cc 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -395,7 +395,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, MAYBE_IncognitoSplitMode) { test::WaitForBookmarkModelToLoad(bookmark_model); const BookmarkNode* parent = bookmark_model->bookmark_bar_node(); bookmark_model->AddURL( - parent, 0, ASCIIToUTF16("Title"), GURL("about:blank")); + parent, 0, base::ASCIIToUTF16("Title"), GURL("about:blank")); page_complete.Wait(); page2_complete.Wait(); @@ -511,8 +511,9 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, EventDispatchToTab) { BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(browser()->profile()); test::WaitForBookmarkModelToLoad(bookmark_model); - bookmark_utils::AddIfNotBookmarked( - bookmark_model, GURL("http://www.google.com"), UTF8ToUTF16("Google")); + bookmark_utils::AddIfNotBookmarked(bookmark_model, + GURL("http://www.google.com"), + base::UTF8ToUTF16("Google")); EXPECT_TRUE(event_page_ready.WaitUntilSatisfied()); diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index 7223cad..ee997994 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -169,10 +169,10 @@ std::set<MenuItem::Id> MenuItem::RemoveAllDescendants() { base::string16 MenuItem::TitleWithReplacement(const base::string16& selection, size_t max_length) const { - base::string16 result = UTF8ToUTF16(title_); + base::string16 result = base::UTF8ToUTF16(title_); // TODO(asargent) - Change this to properly handle %% escaping so you can // put "%s" in titles that won't get substituted. - ReplaceSubstringsAfterOffset(&result, 0, ASCIIToUTF16("%s"), selection); + ReplaceSubstringsAfterOffset(&result, 0, base::ASCIIToUTF16("%s"), selection); if (result.length() > max_length) result = gfx::TruncateString(result, max_length); diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 70dafe9..9d24755 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -562,7 +562,7 @@ TEST_F(MenuManagerTest, ExecuteCommand) { params.media_type = blink::WebContextMenuData::MediaTypeImage; params.src_url = GURL("http://foo.bar/image.png"); params.page_url = GURL("http://foo.bar"); - params.selection_text = ASCIIToUTF16("Hello World"); + params.selection_text = base::ASCIIToUTF16("Hello World"); params.is_editable = false; Extension* extension = AddExtension("test"); diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index 39b58bc..6da021a 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.cc @@ -190,13 +190,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) { ASSERT_EQ(size_before + 1, service->extensions()->size()); - EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur: l10n page action").c_str(), + EXPECT_STREQ(base::WideToUTF8(L"Hreggvi\u00F0ur: l10n page action").c_str(), extension->description().c_str()); - EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur is my name").c_str(), + EXPECT_STREQ(base::WideToUTF8(L"Hreggvi\u00F0ur is my name").c_str(), extension->name().c_str()); int tab_id = ExtensionTabUtil::GetTabId( browser()->tab_strip_model()->GetActiveWebContents()); - EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur").c_str(), + EXPECT_STREQ(base::WideToUTF8(L"Hreggvi\u00F0ur").c_str(), ExtensionActionManager::Get(browser()->profile())-> GetPageAction(*extension)-> GetTitle(tab_id).c_str()); diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc index 98a67b6..bc2e3ec 100644 --- a/chrome/browser/extensions/plugin_manager.cc +++ b/chrome/browser/extensions/plugin_manager.cc @@ -167,9 +167,10 @@ void PluginManager::UpdatePluginListWithNaClModules() { // manifest file. content::WebPluginMimeType mime_type_info; mime_type_info.mime_type = iter->mime_type; - mime_type_info.additional_param_names.push_back(UTF8ToUTF16("nacl")); + mime_type_info.additional_param_names.push_back( + base::UTF8ToUTF16("nacl")); mime_type_info.additional_param_values.push_back( - UTF8ToUTF16(iter->url.spec())); + base::UTF8ToUTF16(iter->url.spec())); info.mime_types.push_back(mime_type_info); } diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index eb264fd..6647a8a 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -41,6 +41,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" +using base::ASCIIToUTF16; using content::BrowserThread; using content::UtilityProcessHost; @@ -380,7 +381,7 @@ void SandboxedUnpacker::OnUnpackExtensionSucceeded( COULD_NOT_LOCALIZE_EXTENSION, l10n_util::GetStringFUTF16( IDS_EXTENSION_PACKAGE_ERROR_MESSAGE, - UTF8ToUTF16(utf8_error))); + base::UTF8ToUTF16(utf8_error))); return; } diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index 9e87260..3719251 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -45,7 +45,7 @@ void StartupHelper::OnPackSuccess( const base::FilePath& output_private_key_path) { pack_job_succeeded_ = true; PrintPackExtensionMessage( - UTF16ToUTF8( + base::UTF16ToUTF8( PackExtensionJob::StandardSuccessMessage(crx_path, output_private_key_path))); } @@ -191,7 +191,7 @@ bool StartupHelper::ValidateCrx(const CommandLine& cmd_line, bool success = helper->success(); if (!success) - *error = UTF16ToUTF8(helper->error()); + *error = base::UTF16ToUTF8(helper->error()); return success; } diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc index 560e4a4..736acd9 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc @@ -99,8 +99,8 @@ base::string16 SuspiciousExtensionBubbleController::GetOverflowText( // Just before string freeze, we checked in # as a substitution value for // this string, whereas we should have used $1. It was discovered too late, // so we do the substitution by hand in that case. - if (overflow_string.find(ASCIIToUTF16("#")) != base::string16::npos) { - base::ReplaceChars(overflow_string, ASCIIToUTF16("#").c_str(), + if (overflow_string.find(base::ASCIIToUTF16("#")) != base::string16::npos) { + base::ReplaceChars(overflow_string, base::ASCIIToUTF16("#").c_str(), overflow_count, &new_string); } else { new_string = l10n_util::GetStringFUTF16( diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index d26c213..ba26a96 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -319,7 +319,7 @@ void TabHelper::FinishCreateHostedApp( if (install_info.title.empty()) install_info.title = web_contents()->GetTitle(); if (install_info.title.empty()) - install_info.title = UTF8ToUTF16(install_info.app_url.spec()); + install_info.title = base::UTF8ToUTF16(install_info.app_url.spec()); install_info.urls.push_back(install_info.app_url); install_info.is_bookmark_app = true; diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 2f020ec..986250e 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -117,7 +117,7 @@ ThemeInstalledInfoBarDelegate* base::string16 ThemeInstalledInfoBarDelegate::GetMessageText() const { return l10n_util::GetStringFUTF16(IDS_THEME_INSTALL_INFOBAR_LABEL, - UTF8ToUTF16(name_)); + base::UTF8ToUTF16(name_)); } int ThemeInstalledInfoBarDelegate::GetButtons() const { diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc index f73f0a3..b23e018 100644 --- a/chrome/browser/extensions/unpacked_installer.cc +++ b/chrome/browser/extensions/unpacked_installer.cc @@ -286,7 +286,7 @@ void UnpackedInstaller::ConfirmInstall() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); base::string16 error = installer_.CheckManagementPolicy(); if (!error.empty()) { - ReportExtensionLoadError(UTF16ToUTF8(error)); + ReportExtensionLoadError(base::UTF16ToUTF8(error)); return; } diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 50cd3fc1..5325bcf 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -385,7 +385,7 @@ void WebstoreInstaller::Observe(int type, // replacing with base::string16. See crbug.com/71980. const base::string16* error = content::Details<const base::string16>(details).ptr(); - const std::string utf8_error = UTF16ToUTF8(*error); + const std::string utf8_error = base::UTF16ToUTF8(*error); if (download_url_ == crx_installer->original_download_url()) ReportFailure(utf8_error, FAILURE_REASON_OTHER); break; diff --git a/chrome/browser/extensions/webstore_installer_test.cc b/chrome/browser/extensions/webstore_installer_test.cc index 26d3549..d43b362 100644 --- a/chrome/browser/extensions/webstore_installer_test.cc +++ b/chrome/browser/extensions/webstore_installer_test.cc @@ -122,6 +122,6 @@ void WebstoreInstallerTest::RunTestAsync( "%s('%s')", test_function_name.c_str(), test_gallery_url_.c_str()); browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost()-> ExecuteJavascriptInWebFrame( - UTF8ToUTF16(std::string()), - UTF8ToUTF16(script)); + base::UTF8ToUTF16(std::string()), + base::UTF8ToUTF16(script)); } |