Convert string16 to base::string16 in content.

content/browser/plugin_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/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
@@ skipping 65 matching lines @@
 #endif
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     base::FilePath path = GetTestFilePath("", "");
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
   }
 
   static void LoadAndWaitInWindow(Shell* window, const GURL& url) {
-    string16 expected_title(ASCIIToUTF16("OK"));
+    base::string16 expected_title(ASCIIToUTF16("OK"));
     TitleWatcher title_watcher(window->web_contents(), expected_title);
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found"));
     NavigateToURL(window, url);
-    string16 title = title_watcher.WaitAndGetTitle();
+    base::string16 title = title_watcher.WaitAndGetTitle();
     if (title == ASCIIToUTF16("plugin_not_found")) {
       const testing::TestInfo* const test_info =
           testing::UnitTest::GetInstance()->current_test_info();
       VLOG(0) << "PluginTest." << test_info->name()
               << " not running because plugin not installed.";
     } else {
       EXPECT_EQ(expected_title, title);
     }
   }
 
@@ skipping 61 matching lines @@
 
 #if defined(OS_WIN)
 // Tests if a plugin executing a self deleting script in the context of
 // a synchronous mouseup works correctly.
 // This was never ported to Mac. The only thing remaining is to make
 // SimulateMouseClick get to Mac plugins, currently it doesn't work.
 IN_PROC_BROWSER_TEST_F(PluginTest,
                        MAYBE(SelfDeletePluginInvokeInSynchronousMouseUp)) {
   NavigateToURL(shell(), GetURL("execute_script_delete_in_mouse_up.html"));
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   TitleWatcher title_watcher(shell()->web_contents(), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
   SimulateMouseClick(shell()->web_contents(), 0,
       blink::WebMouseEvent::ButtonLeft);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
 
 // Flaky, http://crbug.com/302274.
 #if defined(OS_MACOSX)
@@ skipping 10 matching lines @@
 }
 
 // Tests if a plugin executing a self deleting script using Invoke with
 // a modal dialog showing works without crashing or hanging
 // Disabled, flakily exceeds timeout, http://crbug.com/46257.
 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(SelfDeletePluginInvokeAlert)) {
   // Navigate asynchronously because if we waitd until it completes, there's a
   // race condition where the alert can come up before we start watching for it.
   shell()->LoadURL(GetURL("self_delete_plugin_invoke_alert.html"));
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   TitleWatcher title_watcher(shell()->web_contents(), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
 
   WaitForAppModalDialog(shell());
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Test passing arguments to a plugin.
 // crbug.com/306318
@@ skipping 186 matching lines @@
 }
 
 #if defined(OS_MACOSX)
 // Test is flaky, see http://crbug.com/134515.
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) {
   gfx::Rect bounds(50, 50, 400, 400);
   SetWindowBounds(shell()->window(), bounds);
 
   NavigateToURL(shell(), GetURL("convert_point.html"));
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   TitleWatcher title_watcher(shell()->web_contents(), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
   // TODO(stuartmorgan): When the automation system supports sending clicks,
   // change the test to trigger on mouse-down rather than window focus.
 
   // TODO: is this code still needed? It was here when it used to run in
   // browser_tests.
   //static_cast<WebContentsDelegate*>(shell())->
   //    ActivateContents(shell()->web_contents());
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
@@ skipping 126 matching lines @@
   ResourceDispatcherHostDelegate* old_delegate =
       ResourceDispatcherHostImpl::Get()->delegate();
   ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);
   LoadAndWait(url);
   test_delegate.WaitForPluginRequest();
   ASSERT_TRUE(test_delegate.found_cookie());
   ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);
 }
 
 }  // namespace content