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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/apps/web_view_interactive_browsertest.cc

Issue 105193002: Replace string16 with base::string16. (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/apps/web_view_browsertest.cc ('k') | chrome/browser/autocomplete/autocomplete_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/web_view_interactive_browsertest.cc
diff --git a/chrome/browser/apps/web_view_interactive_browsertest.cc b/chrome/browser/apps/web_view_interactive_browsertest.cc
index 4e79775f2cff613b8b21269e6a0f9f7759a8d834..15a1bba4652133f4a483354e60b65ec7c86a0fc8 100644
--- a/chrome/browser/apps/web_view_interactive_browsertest.cc
+++ b/chrome/browser/apps/web_view_interactive_browsertest.cc
@@ -297,8 +297,8 @@ class WebViewInteractiveTest
};
void WaitForTitle(const char* title) {
- string16 expected_title(ASCIIToUTF16(title));
- string16 error_title(ASCIIToUTF16("FAILED"));
+ base::string16 expected_title(ASCIIToUTF16(title));
+ base::string16 error_title(ASCIIToUTF16("FAILED"));
content::TitleWatcher title_watcher(guest_web_contents(), expected_title);
title_watcher.AlsoWaitForTitle(error_title);
ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle());
@@ -324,8 +324,8 @@ class WebViewInteractiveTest
ASSERT_TRUE(!popup_rwh->IsRenderView());
ASSERT_TRUE(popup_rwh->GetView());
- string16 expected_title = ASCIIToUTF16("PASSED2");
- string16 error_title = ASCIIToUTF16("FAILED");
+ base::string16 expected_title = ASCIIToUTF16("PASSED2");
+ base::string16 error_title = ASCIIToUTF16("FAILED");
content::TitleWatcher title_watcher(guest_web_contents(), expected_title);
title_watcher.AlsoWaitForTitle(error_title);
EXPECT_TRUE(content::ExecuteScript(guest_web_contents(),
« no previous file with comments | « chrome/browser/apps/web_view_browsertest.cc ('k') | chrome/browser/autocomplete/autocomplete_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698