Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc |
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc |
index 687ce57606f104c9d79885bb55278902cbea59d7..eb3bdaeb209656835da4057ccedb93e0d80aaa95 100644 |
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc |
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc |
@@ -196,7 +196,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest { |
{ |
// Do a swipe-right now. That should navigate backwards. |
- base::string16 expected_title = ASCIIToUTF16("Title: #1"); |
+ base::string16 expected_title = base::ASCIIToUTF16("Title: #1"); |
content::TitleWatcher title_watcher(web_contents, expected_title); |
generator.GestureScrollSequence( |
gfx::Point(bounds.x() + 2, bounds.y() + 10), |
@@ -214,7 +214,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest { |
{ |
// Do a fling-right now. That should navigate backwards. |
- base::string16 expected_title = ASCIIToUTF16("Title:"); |
+ base::string16 expected_title = base::ASCIIToUTF16("Title:"); |
content::TitleWatcher title_watcher(web_contents, expected_title); |
generator.GestureScrollSequence( |
gfx::Point(bounds.x() + 2, bounds.y() + 10), |
@@ -232,7 +232,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest { |
{ |
// Do a swipe-left now. That should navigate forward. |
- base::string16 expected_title = ASCIIToUTF16("Title: #1"); |
+ base::string16 expected_title = base::ASCIIToUTF16("Title: #1"); |
content::TitleWatcher title_watcher(web_contents, expected_title); |
generator.GestureScrollSequence( |
gfx::Point(bounds.right() - 10, bounds.y() + 10), |
@@ -438,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, OverscrollScreenshot) { |
{ |
// Now, swipe right to navigate backwards. This should navigate away from |
// index 3 to index 2, and index 3 should have a screenshot. |
- base::string16 expected_title = ASCIIToUTF16("Title: #2"); |
+ base::string16 expected_title = base::ASCIIToUTF16("Title: #2"); |
content::TitleWatcher title_watcher(web_contents, expected_title); |
aura::Window* content = web_contents->GetView()->GetContentNativeView(); |
gfx::Rect bounds = content->GetBoundsInRootWindow(); |
@@ -469,7 +469,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, OverscrollScreenshot) { |
{ |
// Navigate back in history. |
- base::string16 expected_title = ASCIIToUTF16("Title: #3"); |
+ base::string16 expected_title = base::ASCIIToUTF16("Title: #3"); |
content::TitleWatcher title_watcher(web_contents, expected_title); |
web_contents->GetController().GoBack(); |
base::string16 actual_title = title_watcher.WaitAndGetTitle(); |
@@ -641,7 +641,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, |
// Do a swipe left to start a forward navigation. Then quickly do a swipe |
// right. |
- base::string16 expected_title = ASCIIToUTF16("Title: #2"); |
+ base::string16 expected_title = base::ASCIIToUTF16("Title: #2"); |
content::TitleWatcher title_watcher(web_contents, expected_title); |
NavigationWatcher nav_watcher(web_contents); |