[HBD] Only use Plugin Content Settings for Flash.

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 "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 14 matching lines @@
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mhtml_generation_params.h"
 #include "content/public/test/browser_test_utils.h"
+#include "content/public/test/ppapi_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "media/cdm/cdm_paths.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
+#include "ppapi/shared_impl/ppapi_switches.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
-#if defined(ENABLE_PEPPER_CDMS)

[raymes, 2016/09/26 08:18:29]

I'm not sure if this was specifically testing some CDM related thing. It doesn't
seem to be specific to CDM but we should make sure we're not losing coverage.
Perhaps ask xhwang?

[tommycli, 2016/09/26 16:29:44]

xhwang, can you verify that changing this to test the Power Saver plugin doesn't
decrease any coverage of the CDM plugin?

(It looked like it just used the CDM plugin because it was convenient)

-#include "chrome/browser/media/pepper_cdm_test_constants.h"
-#include "chrome/browser/media/pepper_cdm_test_helper.h"
-#endif
-
 using content::BrowserThread;
 using net::URLRequestMockHTTPJob;
 
 namespace {
 
 const LocalSharedObjectsContainer* GetSiteSettingsCookieContainer(
     Browser* browser) {
   TabSpecificContentSettings* settings =
       TabSpecificContentSettings::FromWebContents(
           browser->tab_strip_model()->GetWebContentsAt(0));
@@ skipping 270 matching lines @@
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
   EXPECT_TRUE(TabSpecificContentSettings::FromWebContents(web_contents)->
       IsContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES));
 }
 
 #if defined(ENABLE_PLUGINS)
 class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest {
  protected:
-  // Registers any CDM plugins not registered by default.
   void SetUpCommandLine(base::CommandLine* command_line) override {
-#if defined(ENABLE_PEPPER_CDMS)
-    // Append the switch to register the External Clear Key CDM.
-    base::FilePath::StringType pepper_plugins = BuildPepperCdmRegistration(
-        kClearKeyCdmBaseDirectory, kClearKeyCdmAdapterFileName,
-        kClearKeyCdmDisplayName, kClearKeyCdmPepperMimeType);
-    command_line->AppendSwitchNative(switches::kRegisterPepperPlugins,
-                                     pepper_plugins);
-#endif  // defined(ENABLE_PEPPER_CDMS)
+    // This plugin is treated like Flash by Content Settings.
+    ASSERT_TRUE(ppapi::RegisterPowerSaverTestPlugin(command_line));
 
 #if !defined(DISABLE_NACL)
     // Ensure NaCl can run.
     command_line->AppendSwitch(switches::kEnableNaCl);
 #endif
   }
 
-#if defined(ENABLE_PEPPER_CDMS)
   void SetUpDefaultCommandLine(base::CommandLine* command_line) override {
     base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM);
     InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line);
     test_launcher_utils::RemoveCommandLineSwitch(
         default_command_line, switches::kDisableComponentUpdate, command_line);
   }
-#endif  // defined(ENABLE_PEPPER_CDMS)
 
   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();
 
     base::string16 expected_title(base::ASCIIToUTF16(expected_result));
     content::TitleWatcher title_watcher(web_contents, expected_title);
 
     // GetTestUrl assumes paths, so we must append query parameters to result.
@@ skipping 82 matching lines @@
     PepperContentSettingsSpecialCasesTest::SetUpOnMainThread();
     HostContentSettingsMapFactory::GetForProfile(browser()->profile())
         ->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                    CONTENT_SETTING_ALLOW);
     HostContentSettingsMapFactory::GetForProfile(browser()->profile())
         ->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT,
                                    CONTENT_SETTING_BLOCK);
   }
 };
 
-#if defined(ENABLE_PEPPER_CDMS)
 // A sanity check to verify that the plugin that is used as a baseline below
 // can be loaded.
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesTest, Baseline) {
-  HostContentSettingsMapFactory::GetForProfile(browser()->profile())
-      ->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                 CONTENT_SETTING_ALLOW);
-
-  RunLoadPepperPluginTest(kClearKeyCdmPepperMimeType, true);
+  RunLoadPepperPluginTest(content::kTestPluginMimeType, true);
 }
-#endif  // defined(ENABLE_PEPPER_CDMS)
 
 // The following tests verify that Pepper plugins that use JavaScript settings
 // instead of Plugins settings still work when Plugins are blocked.
 
-#if defined(ENABLE_PEPPER_CDMS)
 // The plugin successfully loaded above is blocked.
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
                        Normal) {
-  RunLoadPepperPluginTest(kClearKeyCdmPepperMimeType, false);
+  RunLoadPepperPluginTest(content::kTestPluginMimeType, false);
 }
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
                        WidevineCdm) {
   // Check that Widevine CDM is available and registered.
   base::FilePath adapter_path =
       GetPepperCdmPath(kWidevineCdmBaseDirectory, kWidevineCdmAdapterFileName);
   EXPECT_TRUE(base::PathExists(adapter_path)) << adapter_path.MaybeAsASCII();
   EXPECT_TRUE(IsPepperCdmRegistered(kWidevineCdmPluginMimeType));
   RunLoadPepperPluginTest(kWidevineCdmPluginMimeType, true);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_CHROMEOS)
-#endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesPluginsBlockedTest,
                        NaCl) {
   RunLoadPepperPluginTest("application/x-nacl", true);
 }
 #endif  // !defined(DISABLE_NACL)
 
 // The following tests verify that those same Pepper plugins do not work when
 // JavaScript is blocked.
 
-#if defined(ENABLE_PEPPER_CDMS)
 // A plugin with no special behavior is not blocked when JavaScript is blocked.
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
                        Normal) {
-  RunJavaScriptBlockedTest("load_clearkey_no_js.html", false);
+  RunJavaScriptBlockedTest("load_test_plugin_no_js.html", false);
 }
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
                        WidevineCdm) {
   // Check that Widevine CDM is available and registered.
   base::FilePath adapter_path =
       GetPepperCdmPath(kWidevineCdmBaseDirectory, kWidevineCdmAdapterFileName);
   EXPECT_TRUE(base::PathExists(adapter_path)) << adapter_path.MaybeAsASCII();
   EXPECT_TRUE(IsPepperCdmRegistered(kWidevineCdmPluginMimeType));
   RunJavaScriptBlockedTest("load_widevine_no_js.html", true);
 }
 #endif  // defined(WIDEVINE_CDM_AVAILABLE)
-#endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if !defined(DISABLE_NACL)
 IN_PROC_BROWSER_TEST_F(PepperContentSettingsSpecialCasesJavaScriptBlockedTest,
                        NaCl) {
   RunJavaScriptBlockedTest("load_nacl_no_js.html", true);
 }
 #endif  // !defined(DISABLE_NACL)
 
 #endif  // defined(ENABLE_PLUGINS)