Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

chrome/browser/content_settings/permission_context_base_unittest.cc

 // Copyright 2014 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 "chrome/browser/content_settings/permission_context_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/content_settings/core/common/permission_request_id.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestPermissionContext : public PermissionContextBase {
  public:
   TestPermissionContext(Profile* profile,
                   const ContentSettingsType permission_type)
    : PermissionContextBase(profile, permission_type),
@@ skipping 72 matching lines @@
   }
 
   void TestAskAndGrant_TestContent() {
     TestPermissionContext permission_context(
         profile(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
     GURL url("http://www.google.com");
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
-        web_contents()->GetRenderViewHost()->GetRoutingID(),
+        web_contents()->GetMainFrame()->GetRoutingID(),
         -1, GURL());
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
     RespondToPermission(&permission_context, id, url, true);
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_TRUE(permission_context.permission_granted());
     EXPECT_TRUE(permission_context.tab_context_updated());
 
     ContentSetting setting =
         profile()->GetHostContentSettingsMap()->GetContentSetting(
             url.GetOrigin(), url.GetOrigin(),
             CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string());
     EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
   }
 
   void TestAskAndDismiss_TestContent() {
     TestPermissionContext permission_context(
         profile(), CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
     GURL url("http://www.google.es");
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
-        web_contents()->GetRenderViewHost()->GetRoutingID(),
+        web_contents()->GetMainFrame()->GetRoutingID(),
         -1, GURL());
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
     RespondToPermission(&permission_context, id, url, false);
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_FALSE(permission_context.permission_granted());
     EXPECT_TRUE(permission_context.tab_context_updated());
 
     ContentSetting setting =
         profile()->GetHostContentSettingsMap()->GetContentSetting(
             url.GetOrigin(), url.GetOrigin(),
             CONTENT_SETTINGS_TYPE_MIDI_SYSEX, std::string());
     EXPECT_EQ(CONTENT_SETTING_ASK, setting);
   }
 
   void TestRequestPermissionInvalidUrl(ContentSettingsType type) {
     TestPermissionContext permission_context(profile(), type);
     GURL url;
     ASSERT_FALSE(url.is_valid());
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
-        web_contents()->GetRenderViewHost()->GetRoutingID(),
+        web_contents()->GetMainFrame()->GetRoutingID(),
         -1, GURL());
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_FALSE(permission_context.permission_granted());
     EXPECT_TRUE(permission_context.tab_context_updated());
 
     ContentSetting setting =
         profile()->GetHostContentSettingsMap()->GetContentSetting(
             url.GetOrigin(), url.GetOrigin(), type, std::string());
     EXPECT_EQ(CONTENT_SETTING_ASK, setting);
   }
 
   void TestGrantAndRevoke_TestContent(ContentSettingsType type,
                                       ContentSetting expected_default) {
     TestPermissionContext permission_context(profile(), type);
     GURL url("https://www.google.com");
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
-        web_contents()->GetRenderViewHost()->GetRoutingID(),
+        web_contents()->GetMainFrame()->GetRoutingID(),
         -1, GURL());
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
     RespondToPermission(&permission_context, id, url, true);
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_TRUE(permission_context.permission_granted());
@@ skipping 85 matching lines @@
 #endif
   TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
                                  CONTENT_SETTING_ASK);
   TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
                                  CONTENT_SETTING_ASK);
 #if defined(OS_ANDROID)
   TestGrantAndRevoke_TestContent(
       CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, CONTENT_SETTING_ASK);
 #endif
 }