| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Tests for the top plugins to catch regressions in our plugin host code, as | 5 // Tests for the top plugins to catch regressions in our plugin host code, as |
| 6 // well as in the out of process code. Currently this tests: | 6 // well as in the out of process code. Currently this tests: |
| 7 // Flash | 7 // Flash |
| 8 // Real | 8 // Real |
| 9 // QuickTime | 9 // QuickTime |
| 10 // Windows Media Player | 10 // Windows Media Player |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 GURL url = GetTestUrl("done", mock_http); | 117 GURL url = GetTestUrl("done", mock_http); |
| 118 scoped_refptr<TabProxy> tab(GetActiveTab()); | 118 scoped_refptr<TabProxy> tab(GetActiveTab()); |
| 119 | 119 |
| 120 const std::string result = | 120 const std::string result = |
| 121 WaitUntilCookieNonEmpty(tab, url, kTestCompleteCookie, wait_time); | 121 WaitUntilCookieNonEmpty(tab, url, kTestCompleteCookie, wait_time); |
| 122 ASSERT_EQ(kTestCompleteSuccess, result); | 122 ASSERT_EQ(kTestCompleteSuccess, result); |
| 123 } | 123 } |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 #if defined(OS_MACOSX) |
| 127 TEST_F(PluginTest, DISABLED_Flash) { |
| 128 #else |
| 126 TEST_F(PluginTest, Flash) { | 129 TEST_F(PluginTest, Flash) { |
| 130 #endif |
| 127 // Note: This does not work with the npwrapper on 64-bit Linux. Install the | 131 // Note: This does not work with the npwrapper on 64-bit Linux. Install the |
| 128 // native 64-bit Flash to run the test. | 132 // native 64-bit Flash to run the test. |
| 129 // TODO(thestig) Update this list if we decide to only test against internal | 133 // TODO(thestig) Update this list if we decide to only test against internal |
| 130 // Flash plugin in the future? | 134 // Flash plugin in the future? |
| 131 std::string kFlashQuery = | 135 std::string kFlashQuery = |
| 132 #if defined(OS_WIN) | 136 #if defined(OS_WIN) |
| 133 "npswf32.dll" | 137 "npswf32.dll" |
| 134 #elif defined(OS_MACOSX) | 138 #elif defined(OS_MACOSX) |
| 135 "Flash Player.plugin" | 139 "Flash Player.plugin" |
| 136 #elif defined(OS_POSIX) | 140 #elif defined(OS_POSIX) |
| 137 "libflashplayer.so" | 141 "libflashplayer.so" |
| 138 #endif | 142 #endif |
| 139 ; | 143 ; |
| 140 TestPlugin("flash.html?" + kFlashQuery, action_max_timeout_ms(), false); | 144 TestPlugin("flash.html?" + kFlashQuery, action_max_timeout_ms(), false); |
| 141 } | 145 } |
| 142 | 146 |
| 143 class ClickToPlayPluginTest : public PluginTest { | 147 class ClickToPlayPluginTest : public PluginTest { |
| 144 public: | 148 public: |
| 145 ClickToPlayPluginTest() { | 149 ClickToPlayPluginTest() { |
| 146 dom_automation_enabled_ = true; | 150 dom_automation_enabled_ = true; |
| 147 } | 151 } |
| 148 }; | 152 }; |
| 149 | 153 |
| 154 #if defined(OS_MACOSX) |
| 155 TEST_F(ClickToPlayPluginTest, DISABLED_Flash) { |
| 156 #else |
| 150 TEST_F(ClickToPlayPluginTest, Flash) { | 157 TEST_F(ClickToPlayPluginTest, Flash) { |
| 158 #endif |
| 151 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 159 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 152 ASSERT_TRUE(browser.get()); | 160 ASSERT_TRUE(browser.get()); |
| 153 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, | 161 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 154 CONTENT_SETTING_BLOCK)); | 162 CONTENT_SETTING_BLOCK)); |
| 155 | 163 |
| 156 GURL url = GetTestUrl("flash-clicktoplay.html", true); | 164 GURL url = GetTestUrl("flash-clicktoplay.html", true); |
| 157 NavigateToURL(url); | 165 NavigateToURL(url); |
| 158 | 166 |
| 159 scoped_refptr<TabProxy> tab(browser->GetTab(0)); | 167 scoped_refptr<TabProxy> tab(browser->GetTab(0)); |
| 160 ASSERT_TRUE(tab.get()); | 168 ASSERT_TRUE(tab.get()); |
| 161 | 169 |
| 162 ASSERT_TRUE(tab->LoadBlockedPlugins()); | 170 ASSERT_TRUE(tab->LoadBlockedPlugins()); |
| 163 | 171 |
| 164 WaitForFinish(action_max_timeout_ms(), true); | 172 WaitForFinish(action_max_timeout_ms(), true); |
| 165 } | 173 } |
| 166 | 174 |
| 175 #if defined(OS_MACOSX) |
| 176 TEST_F(ClickToPlayPluginTest, DISABLED_FlashDocument) { |
| 177 #else |
| 167 TEST_F(ClickToPlayPluginTest, FlashDocument) { | 178 TEST_F(ClickToPlayPluginTest, FlashDocument) { |
| 179 #endif |
| 168 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 180 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 169 ASSERT_TRUE(browser.get()); | 181 ASSERT_TRUE(browser.get()); |
| 170 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, | 182 ASSERT_TRUE(browser->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, |
| 171 CONTENT_SETTING_BLOCK)); | 183 CONTENT_SETTING_BLOCK)); |
| 172 | 184 |
| 173 scoped_refptr<TabProxy> tab(browser->GetTab(0)); | 185 scoped_refptr<TabProxy> tab(browser->GetTab(0)); |
| 174 ASSERT_TRUE(tab.get()); | 186 ASSERT_TRUE(tab.get()); |
| 175 GURL url = GetTestUrl("js-invoker.swf?callback=done", true); | 187 GURL url = GetTestUrl("js-invoker.swf?callback=done", true); |
| 176 NavigateToURL(url); | 188 NavigateToURL(url); |
| 177 | 189 |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) { | 357 TEST_F(PluginInstallerDownloadTest, PluginInstallerDownloadPathTest) { |
| 346 MessageLoop loop(MessageLoop::TYPE_IO); | 358 MessageLoop loop(MessageLoop::TYPE_IO); |
| 347 Start(); | 359 Start(); |
| 348 loop.Run(); | 360 loop.Run(); |
| 349 | 361 |
| 350 EXPECT_TRUE(success()); | 362 EXPECT_TRUE(success()); |
| 351 EXPECT_TRUE(initial_download_path().BaseName().value() == | 363 EXPECT_TRUE(initial_download_path().BaseName().value() == |
| 352 final_download_path().BaseName().value()); | 364 final_download_path().BaseName().value()); |
| 353 } | 365 } |
| 354 #endif // defined(OS_WIN) | 366 #endif // defined(OS_WIN) |
| OLD | NEW |