| Index: chrome/browser/apps/app_url_redirector_browsertest.cc
|
| diff --git a/chrome/browser/apps/app_url_redirector_browsertest.cc b/chrome/browser/apps/app_url_redirector_browsertest.cc
|
| index b81c71559aea42bb6e41d090fc6f22474b7e4357..c540614e6539a50793278cfe58b5013fd99a4eeb 100644
|
| --- a/chrome/browser/apps/app_url_redirector_browsertest.cc
|
| +++ b/chrome/browser/apps/app_url_redirector_browsertest.cc
|
| @@ -155,7 +155,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestMismatchingNavigationInTab(
|
|
|
| InstallPlatformApp(handler);
|
|
|
| - const string16 success_title = ASCIIToUTF16(success_tab_title);
|
| + const base::string16 success_title = ASCIIToUTF16(success_tab_title);
|
| content::WebContents* tab =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| content::TitleWatcher title_watcher(tab, success_title);
|
| @@ -181,8 +181,8 @@ void PlatformAppUrlRedirectorBrowserTest::TestNegativeXhrInTab(
|
|
|
| InstallPlatformApp(handler);
|
|
|
| - const string16 success_title = ASCIIToUTF16(success_tab_title);
|
| - const string16 failure_title = ASCIIToUTF16(failure_tab_title);
|
| + const base::string16 success_title = ASCIIToUTF16(success_tab_title);
|
| + const base::string16 failure_title = ASCIIToUTF16(failure_tab_title);
|
| content::WebContents* tab =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| content::TitleWatcher title_watcher(tab, success_title);
|
| @@ -297,7 +297,7 @@ void PlatformAppUrlRedirectorBrowserTest::TestNegativeNavigationInBrowser(
|
|
|
| InstallPlatformApp(handler);
|
|
|
| - const string16 success_title = ASCIIToUTF16(success_tab_title);
|
| + const base::string16 success_title = ASCIIToUTF16(success_tab_title);
|
| content::WebContents* tab =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| content::TitleWatcher title_watcher(tab, success_title);
|
|
|