summaryrefslogtreecommitdiffstats
path: root/chrome/browser/external_extension_browsertest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 20:54:29 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 20:54:29 +0000
commitfb94f39dc9252bcc88825f0de1aaa0850c5c7c73 (patch)
treec998c9a5ee8404efc652b5218c160eccb65f2e44 /chrome/browser/external_extension_browsertest.cc
parent6778feddfd9451088649a5b42de79d032832e4ee (diff)
downloadchromium_src-fb94f39dc9252bcc88825f0de1aaa0850c5c7c73.zip
chromium_src-fb94f39dc9252bcc88825f0de1aaa0850c5c7c73.tar.gz
chromium_src-fb94f39dc9252bcc88825f0de1aaa0850c5c7c73.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_extension_browsertest.cc')
-rw-r--r--chrome/browser/external_extension_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc
index 0445c78..37a28e6 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, base::ASCIIToUTF16("OK"));
- title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
+ content::TitleWatcher title_watcher(data.tab, ASCIIToUTF16("OK"));
+ title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
title = title_watcher.WaitAndGetTitle();
}
- EXPECT_EQ(base::ASCIIToUTF16("OK"), title);
+ EXPECT_EQ(ASCIIToUTF16("OK"), title);
}
GURL search_provider_test_url_;