Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6821)

Unified Diff: chrome/browser/content_settings/content_settings_browsertest.cc

Issue 60263003: Run click to play tests on Win Aura since we have NPAPI plugins there. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_browsertest.cc
===================================================================
--- chrome/browser/content_settings/content_settings_browsertest.cc (revision 232915)
+++ chrome/browser/content_settings/content_settings_browsertest.cc (working copy)
@@ -288,7 +288,8 @@
IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
}
-#if !defined(USE_AURA) // No NPAPI plugins with Aura.
+// On Aura NPAPI only works on Windows.
+#if !defined(USE_AURA) || defined(OS_WIN)
class ClickToPlayPluginTest : public ContentSettingsTest {
public:
@@ -465,7 +466,7 @@
EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
}
-#endif // !defined(USE_AURA)
+#endif // !defined(USE_AURA) || defined(OS_WIN)
#if defined(ENABLE_PLUGINS)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698