diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:18:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:18:05 +0000 |
| commit | 04338722eaee6d09b761353fb6e937b41933ff5e (patch) | |
| tree | f15c65f4c1345126fdb05a5855aeb98dbef57bbb /chrome/browser/external_extension_browsertest.cc | |
| parent | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (diff) | |
| download | chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.zip chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.gz chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.bz2 | |
Revert 242454 "Revert 242450 "Update some uses of UTF conversion..."
> Revert 242450 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120953002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/107423005
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/121003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_extension_browsertest.cc')
| -rw-r--r-- | chrome/browser/external_extension_browsertest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index 37a28e6..0445c78 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -70,11 +70,11 @@ class SearchProviderTest : public InProcessBrowserTest { const IsSearchProviderTestData& data) { base::string16 title = data.tab->GetTitle(); if (title.empty()) { - content::TitleWatcher title_watcher(data.tab, ASCIIToUTF16("OK")); - title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); + content::TitleWatcher title_watcher(data.tab, base::ASCIIToUTF16("OK")); + title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL")); title = title_watcher.WaitAndGetTitle(); } - EXPECT_EQ(ASCIIToUTF16("OK"), title); + EXPECT_EQ(base::ASCIIToUTF16("OK"), title); } GURL search_provider_test_url_; |