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

Unified Diff: content/browser/worker_host/test/worker_browsertest.cc

Issue 102593002: Convert string16 to base::string16 in content. (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
Index: content/browser/worker_host/test/worker_browsertest.cc
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc
index a71a28e1f99b49289234ed984c425b3e1518ae72..acd00fba10182ee6e1bc83bac2088b143b5d92ba 100644
--- a/content/browser/worker_host/test/worker_browsertest.cc
+++ b/content/browser/worker_host/test/worker_browsertest.cc
@@ -42,10 +42,10 @@ class WorkerTest : public ContentBrowserTest {
const std::string& test_case,
const std::string& query) {
GURL url = GetTestURL(test_case, query);
- const string16 expected_title = ASCIIToUTF16("OK");
+ const base::string16 expected_title = ASCIIToUTF16("OK");
TitleWatcher title_watcher(window->web_contents(), expected_title);
NavigateToURL(window, url);
- string16 final_title = title_watcher.WaitAndGetTitle();
+ base::string16 final_title = title_watcher.WaitAndGetTitle();
EXPECT_EQ(expected_title, final_title);
}
@@ -275,10 +275,10 @@ IN_PROC_BROWSER_TEST_F(WorkerTest, WebSocketSharedWorker) {
// Run test.
Shell* window = shell();
- const string16 expected_title = ASCIIToUTF16("OK");
+ const base::string16 expected_title = ASCIIToUTF16("OK");
TitleWatcher title_watcher(window->web_contents(), expected_title);
NavigateToURL(window, url);
- string16 final_title = title_watcher.WaitAndGetTitle();
+ base::string16 final_title = title_watcher.WaitAndGetTitle();
EXPECT_EQ(expected_title, final_title);
}
« no previous file with comments | « content/browser/webui/web_ui_message_handler_unittest.cc ('k') | content/browser/worker_host/worker_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698