| 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);
|
| }
|
|
|
|
|