diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 21:00:16 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 21:00:16 +0000 |
| commit | 969201575445f53b11562542f4d8a12d8f1a4777 (patch) | |
| tree | fa491f8ec26fa6bd232e3cf5a5051acd2fea6e97 /chrome/browser/apps/web_view_interactive_browsertest.cc | |
| parent | 84a3403847df91ea351d67e2d50025fd3f0bf651 (diff) | |
| download | chromium_src-969201575445f53b11562542f4d8a12d8f1a4777.zip chromium_src-969201575445f53b11562542f4d8a12d8f1a4777.tar.gz chromium_src-969201575445f53b11562542f4d8a12d8f1a4777.tar.bz2 | |
Replace string16 with base::string16.
This updates portions of chrome/browser/... to use the base namespace.
BUG=
Review URL: https://codereview.chromium.org/105193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/apps/web_view_interactive_browsertest.cc')
| -rw-r--r-- | chrome/browser/apps/web_view_interactive_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/apps/web_view_interactive_browsertest.cc b/chrome/browser/apps/web_view_interactive_browsertest.cc index 4e79775..15a1bba 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(), |