Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4997)

Unified Diff: chrome/browser/search_engines/search_provider_install_data_unittest.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/search/search.cc ('k') | chrome/browser/search_engines/template_url.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/search_provider_install_data_unittest.cc
diff --git a/chrome/browser/search_engines/search_provider_install_data_unittest.cc b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
index a09d1a8baa366ae61ff1965c1956af93f8e0615f..d44108ac4bf933c8d57565decc958597014b66e1 100644
--- a/chrome/browser/search_engines/search_provider_install_data_unittest.cc
+++ b/chrome/browser/search_engines/search_provider_install_data_unittest.cc
@@ -208,7 +208,7 @@ TEST_F(SearchProviderInstallDataTest, GetInstallState) {
// Set up the database.
util_.ChangeModelToLoadState();
std::string host = "www.unittest.com";
- AddNewTemplateURL("http://" + host + "/path", ASCIIToUTF16("unittest"));
+ AddNewTemplateURL("http://" + host + "/path", base::ASCIIToUTF16("unittest"));
// Wait for the changes to be saved.
base::RunLoop().RunUntilIdle();
@@ -220,7 +220,8 @@ TEST_F(SearchProviderInstallDataTest, GetInstallState) {
// Set-up a default and try it all one more time.
std::string default_host = "www.mmm.com";
TemplateURL* default_url =
- AddNewTemplateURL("http://" + default_host + "/", ASCIIToUTF16("mmm"));
+ AddNewTemplateURL("http://" + default_host + "/",
+ base::ASCIIToUTF16("mmm"));
util_.model()->SetDefaultSearchProvider(default_url);
test_get_install_state.RunTests(host, default_host);
}
@@ -229,7 +230,7 @@ TEST_F(SearchProviderInstallDataTest, ManagedDefaultSearch) {
// Set up the database.
util_.ChangeModelToLoadState();
std::string host = "www.unittest.com";
- AddNewTemplateURL("http://" + host + "/path", ASCIIToUTF16("unittest"));
+ AddNewTemplateURL("http://" + host + "/path", base::ASCIIToUTF16("unittest"));
// Set a managed preference that establishes a default search provider.
std::string host2 = "www.managedtest.com";
@@ -256,9 +257,10 @@ TEST_F(SearchProviderInstallDataTest, GoogleBaseUrlChange) {
// Wait for the I/O thread to process the update notification.
base::RunLoop().RunUntilIdle();
- AddNewTemplateURL("{google:baseURL}?q={searchTerms}", ASCIIToUTF16("t"));
+ AddNewTemplateURL("{google:baseURL}?q={searchTerms}",
+ base::ASCIIToUTF16("t"));
TemplateURL* default_url =
- AddNewTemplateURL("http://d.com/", ASCIIToUTF16("d"));
+ AddNewTemplateURL("http://d.com/", base::ASCIIToUTF16("d"));
util_.model()->SetDefaultSearchProvider(default_url);
// Wait for the changes to be saved.
« no previous file with comments | « chrome/browser/search/search.cc ('k') | chrome/browser/search_engines/template_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698