Convert string16 to base::string16 in content.

content/browser/loader/resource_dispatcher_host_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 41 matching lines @@
       got_downloads_ = !!manager->InProgressCount();
   }
 
   GURL GetMockURL(const std::string& file) {
     return URLRequestMockHTTPJob::GetMockUrl(
         base::FilePath().AppendASCII(file));
   }
 
   void CheckTitleTest(const GURL& url,
                       const std::string& expected_title) {
-    string16 expected_title16(ASCIIToUTF16(expected_title));
+    base::string16 expected_title16(ASCIIToUTF16(expected_title));
     TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
     NavigateToURL(shell(), url);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 
-  bool GetPopupTitle(const GURL& url, string16* title) {
+  bool GetPopupTitle(const GURL& url, base::string16* title) {
     NavigateToURL(shell(), url);
 
     ShellAddedObserver new_shell_observer;
 
     // Create dynamic popup.
     if (!ExecuteScript(shell()->web_contents(), "OpenPopup();"))
       return false;
 
     Shell* new_shell = new_shell_observer.GetShell();
     *title = new_shell->web_contents()->GetTitle();
@@ skipping 10 matching lines @@
  private:
   bool got_downloads_;
 };
 
 // Test title for content created by javascript window.open().
 // See http://crbug.com/5988
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle1) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/dynamic1.html"));
-  string16 title;
+  base::string16 title;
   ASSERT_TRUE(GetPopupTitle(url, &title));
   EXPECT_TRUE(StartsWith(title, ASCIIToUTF16("My Popup Title"), true))
       << "Actual title: " << title;
 }
 
 // Test title for content created by javascript window.open().
 // See http://crbug.com/5988
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, DynamicTitle2) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/dynamic2.html"));
-  string16 title;
+  base::string16 title;
   ASSERT_TRUE(GetPopupTitle(url, &title));
   EXPECT_TRUE(StartsWith(title, ASCIIToUTF16("My Dynamic Title"), true))
       << "Actual title: " << title;
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        SniffHTMLWithNoContentType) {
   CheckTitleTest(GetMockURL("content-sniffer-test0.html"),
                  "Content Sniffer Test 0");
 }
@@ skipping 235 matching lines @@
 
   // Check that renderer-initiated navigations still work.  In a previous bug,
   // the ResourceDispatcherHost would think that such navigations were
   // cross-site, because we didn't clean up from the previous request.  Since
   // WebContentsImpl was in the NORMAL state, it would ignore the attempt to run
   // the onunload handler, and the navigation would fail. We can't test by
   // redirecting to javascript:window.location='someURL', since javascript:
   // URLs are prohibited by policy from interacting with sensitive chrome
   // pages of which the error page is one.  Instead, use automation to kick
   // off the navigation, and wait to see that the tab loads.
-  string16 expected_title16(ASCIIToUTF16("Title Of Awesomeness"));
+  base::string16 expected_title16(ASCIIToUTF16("Title Of Awesomeness"));
   TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
 
   bool success;
   GURL test_url(embedded_test_server()->GetURL("/title2.html"));
   std::string redirect_script = "window.location='" +
       test_url.possibly_invalid_spec() + "';" +
       "window.domAutomationController.send(true);";
   EXPECT_TRUE(ExecuteScriptAndExtractBool(
       shell()->web_contents(),
       redirect_script,
@@ skipping 80 matching lines @@
       "http://localhost:%d/set_cookie.html", embedded_test_server()->port()));
   GURL url(embedded_test_server()->GetURL("/redirect?" + set_cookie_url));
 
   ShellContentBrowserClient::SetSwapProcessesForRedirect(true);
   ShellNetworkDelegate::SetAcceptAllCookies(false);
 
   CheckTitleTest(url, "cookie set");
 }
 
 }  // namespace content