Replace string16 with base::string16.

chrome/browser/content_settings/content_settings_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/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
@@ skipping 297 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
 
   content::RenderViewHost* host =
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
   ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance();
   int process_id = host->GetProcess()->GetID();
   base::FilePath path(FILE_PATH_LITERAL("blah"));
   EXPECT_FALSE(filter->CanLoadPlugin(process_id, path));
   filter->AuthorizeAllPlugins(process_id);
@@ skipping 11 matching lines @@
 
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
   browser()->profile()->GetHostContentSettingsMap()
       ->SetContentSetting(ContentSettingsPattern::FromURL(url),
                           ContentSettingsPattern::Wildcard(),
                           CONTENT_SETTINGS_TYPE_PLUGINS,
                           std::string(),
                           CONTENT_SETTING_ALLOW);
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Verify that plugins can be blocked on a domain by adding an exception.
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, BlockException) {
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
 
   browser()->profile()->GetHostContentSettingsMap()
       ->SetContentSetting(ContentSettingsPattern::FromURL(url),
                           ContentSettingsPattern::Wildcard(),
                           CONTENT_SETTINGS_TYPE_PLUGINS,
                           std::string(),
                           CONTENT_SETTING_BLOCK);
 
-  string16 expected_title(ASCIIToUTF16("Click To Play"));
+  base::string16 expected_title(ASCIIToUTF16("Click To Play"));
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Crashes on Mac Asan.  http://crbug.com/239169
 #if defined(OS_MACOSX)
 #define MAYBE_LoadAllBlockedPlugins DISABLED_LoadAllBlockedPlugins
 // TODO(jschuh): Flaky plugin tests. crbug.com/244653
 #elif defined(OS_WIN) && defined(ARCH_CPU_X86_64)
 #define MAYBE_LoadAllBlockedPlugins DISABLED_LoadAllBlockedPlugins
 #else
 #define MAYBE_LoadAllBlockedPlugins LoadAllBlockedPlugins
 #endif
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, MAYBE_LoadAllBlockedPlugins) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(),
       base::FilePath().AppendASCII("load_all_blocked_plugins.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
-  string16 expected_title1(ASCIIToUTF16("1"));
+  base::string16 expected_title1(ASCIIToUTF16("1"));
   content::TitleWatcher title_watcher1(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title1);
 
   content::RenderViewHost* host =
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
   ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
       host->GetProcess()->GetID());
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
   EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle());
 
-  string16 expected_title2(ASCIIToUTF16("2"));
+  base::string16 expected_title2(ASCIIToUTF16("2"));
   content::TitleWatcher title_watcher2(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title2);
 
   ASSERT_TRUE(content::ExecuteScript(
       browser()->tab_strip_model()->GetActiveWebContents(), "window.inject()"));
 
   EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle());
 }
 
 // If this flakes, use http://crbug.com/113057.
 // TODO(jschuh): Hanging plugin tests. crbug.com/244653
 #if !defined(OS_WIN) && !defined(ARCH_CPU_X86_64)
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, NoCallbackAtLoad) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url("data:application/vnd.npapi-test,CallOnStartup();");
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Inject the callback function into the HTML page generated by the browser.
   ASSERT_TRUE(content::ExecuteScript(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "CallOnStartup = function() { document.title = \"OK\"; }"));
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
 
   content::RenderViewHost* host =
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
   ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
       host->GetProcess()->GetID());
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, DeleteSelfAtLoad) {
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK);
 
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(),
       base::FilePath().AppendASCII("plugin_delete_self_at_load.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
-  string16 expected_title(ASCIIToUTF16("OK"));
+  base::string16 expected_title(ASCIIToUTF16("OK"));
   content::TitleWatcher title_watcher(
       browser()->tab_strip_model()->GetActiveWebContents(), expected_title);
 
   content::RenderViewHost* host =
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost();
   ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
       host->GetProcess()->GetID());
   host->Send(new ChromeViewMsg_LoadBlockedPlugins(
       host->GetRoutingID(), std::string()));
 
@@ skipping 45 matching lines @@
     // Ensure NaCl can run.
     command_line->AppendSwitch(switches::kEnableNaCl);
 #endif
   }
 
   void RunLoadPepperPluginTest(const char* mime_type, bool expect_loaded) {
     const char* expected_result = expect_loaded ? "Loaded" : "Not Loaded";
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
-    string16 expected_title(ASCIIToUTF16(expected_result));
+    base::string16 expected_title(ASCIIToUTF16(expected_result));
     content::TitleWatcher title_watcher(web_contents, expected_title);
 
     // GetTestUrl assumes paths, so we must append query parameters to result.
     GURL file_url = ui_test_utils::GetTestUrl(
         base::FilePath(),
         base::FilePath().AppendASCII("load_pepper_plugin.html"));
     GURL url(file_url.spec() +
              base::StringPrintf("?mimetype=%s", mime_type));
     ui_test_utils::NavigateToURL(browser(), url);
 
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
     EXPECT_EQ(!expect_loaded,
               TabSpecificContentSettings::FromWebContents(web_contents)->
                   IsContentBlocked(CONTENT_SETTINGS_TYPE_PLUGINS));
   }
 
   void RunJavaScriptBlockedTest(const char* html_file,
                                 bool expect_is_javascript_content_blocked) {
     // Because JavaScript is disabled, <title> will be the only title set.
     // Checking for it ensures that the page loaded.
     const char* const kExpectedTitle = "Initial Title";
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     TabSpecificContentSettings* tab_settings =
         TabSpecificContentSettings::FromWebContents(web_contents);
-    string16 expected_title(ASCIIToUTF16(kExpectedTitle));
+    base::string16 expected_title(ASCIIToUTF16(kExpectedTitle));
     content::TitleWatcher title_watcher(web_contents, expected_title);
 
     GURL url = ui_test_utils::GetTestUrl(
         base::FilePath(), base::FilePath().AppendASCII(html_file));
     ui_test_utils::NavigateToURL(browser(), url);
 
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
     EXPECT_EQ(expect_is_javascript_content_blocked,
               tab_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_JAVASCRIPT));
@@ skipping 54 matching lines @@
   RunJavaScriptBlockedTest("load_widevine_no_js.html", true);
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
   RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
 #endif  // !defined(DISABLE_NACL)
 }
 
 #endif  // defined(ENABLE_PLUGINS)