diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 20:09:37 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 20:09:37 +0000 |
| commit | 6778feddfd9451088649a5b42de79d032832e4ee (patch) | |
| tree | 5967444597de6ebe7abd308db0f1d10790a4bfd4 /chrome/browser/net/websocket_browsertest.cc | |
| parent | 12ea28018c67f906ecbdc51324c0e0a3dcf02245 (diff) | |
| download | chromium_src-6778feddfd9451088649a5b42de79d032832e4ee.zip chromium_src-6778feddfd9451088649a5b42de79d032832e4ee.tar.gz chromium_src-6778feddfd9451088649a5b42de79d032832e4ee.tar.bz2 | |
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/106543008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/websocket_browsertest.cc')
| -rw-r--r-- | chrome/browser/net/websocket_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 58b4f65..27bf3f9 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -44,8 +44,8 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketSplitSegments) { // Setup page title observer. content::WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); - content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS")); - watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); + content::TitleWatcher watcher(tab, base::ASCIIToUTF16("PASS")); + watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL")); // Visit a HTTP page for testing. std::string scheme("http"); @@ -75,8 +75,8 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, // Setup page title observer. content::WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); - content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS")); - watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); + content::TitleWatcher watcher(tab, base::ASCIIToUTF16("PASS")); + watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL")); // Visit a HTTPS page for testing. std::string scheme("https"); |