Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

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"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.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_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
@@ skipping 276 matching lines @@
       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);
 
   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();
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
   ChromePluginServiceFilter* filter = ChromePluginServiceFilter::GetInstance();
-  int process_id = host->GetProcess()->GetID();
+  int process_id = web_contents->GetMainFrame()->GetProcess()->GetID();
   base::FilePath path(FILE_PATH_LITERAL("blah"));
   EXPECT_FALSE(filter->CanLoadPlugin(process_id, path));
-  filter->AuthorizeAllPlugins(process_id);
+  filter->AuthorizeAllPlugins(web_contents, true, std::string());
   EXPECT_TRUE(filter->CanLoadPlugin(process_id, path));
-  host->Send(new ChromeViewMsg_LoadBlockedPlugins(
-      host->GetRoutingID(), std::string()));
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Verify that plugins can be allowed on a domain by adding an exception
 IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, AllowException) {
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(), base::FilePath().AppendASCII("clicktoplay.html"));
 
   browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting(
@@ skipping 46 matching lines @@
 
   GURL url = ui_test_utils::GetTestUrl(
       base::FilePath(),
       base::FilePath().AppendASCII("load_all_blocked_plugins.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   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()));
+      browser()->tab_strip_model()->GetActiveWebContents(), true,
+      std::string());
   EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle());
 
   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());
@@ skipping 11 matching lines @@
 
   // 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\"; }"));
 
   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()));
+      browser()->tab_strip_model()->GetActiveWebContents(), true,
+      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);
 
   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()));
+      browser()->tab_strip_model()->GetActiveWebContents(), true,
+      std::string());
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 #endif  // !defined(USE_AURA) || defined(OS_WIN)
 
 #if defined(ENABLE_PLUGINS)
 
 class PepperContentSettingsTest : public ContentSettingsTest {
  public:
@@ skipping 137 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)