Index: chrome/browser/extensions/plugin_apitest.cc |
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc |
index 163e942ab392fc24b99a6fa344f6f89e01380a06..7ea38470382f246f4da9f8e106e1f88bf8c91ed3 100644 |
--- a/chrome/browser/extensions/plugin_apitest.cc |
+++ b/chrome/browser/extensions/plugin_apitest.cc |
@@ -48,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { |
// With no extensions, the plugin should not be loaded. |
bool result = false; |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
EXPECT_FALSE(result); |
ExtensionService* service = extensions::ExtensionSystem::Get( |
@@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { |
EXPECT_EQ(size_before + 1, service->extensions()->size()); |
// Now the plugin should be in the cache. |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
// We don't allow extension plugins to run on ChromeOS. |
#if defined(OS_CHROMEOS) |
EXPECT_FALSE(result); |
@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { |
// Now the plugin should be unloaded, and the page should be broken. |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
EXPECT_FALSE(result); |
// If we reload the extension and page, it should work again. |
@@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { |
observer.Wait(); |
} |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
// We don't allow extension plugins to run on ChromeOS. |
#if defined(OS_CHROMEOS) |
EXPECT_FALSE(result); |
@@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { |
WebContents* tab = chrome::GetActiveWebContents(browser()); |
bool result = false; |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
// We don't allow extension plugins to run on ChromeOS. |
#if defined(OS_CHROMEOS) |
EXPECT_FALSE(result); |
@@ -142,7 +142,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { |
browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
// We don't allow extension plugins to run on ChromeOS. |
#if defined(OS_CHROMEOS) |
EXPECT_FALSE(result); |
@@ -154,6 +154,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { |
ui_test_utils::NavigateToURL(browser(), |
net::FilePathToFileURL(extension_dir.AppendASCII("test.html"))); |
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool( |
- tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); |
+ tab->GetRenderViewHost(), "", "testPluginWorks()", &result)); |
EXPECT_FALSE(result); |
} |