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

chrome/browser/content_settings/permission_queue_controller_unittest.cc

 // Copyright 2013 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_queue_controller.h"
 
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.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 "testing/gtest/include/gtest/gtest.h"
 
 
 // PermissionQueueControllerTests ---------------------------------------------
 
 class PermissionQueueControllerTests : public ChromeRenderViewHostTestHarness {
  protected:
   PermissionQueueControllerTests() {}
   ~PermissionQueueControllerTests() override {}
 
   PermissionRequestID RequestID(int bridge_id) {
     return PermissionRequestID(
         web_contents()->GetRenderProcessHost()->GetID(),
-        web_contents()->GetRenderViewHost()->GetRoutingID(),
+        web_contents()->GetMainFrame()->GetRoutingID(),
         bridge_id,
         GURL());
   }
 
  private:
   // ChromeRenderViewHostTestHarness:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     InfoBarService::CreateForWebContents(web_contents());
   }
@@ skipping 66 matching lines @@
 
 TEST_F(PermissionQueueControllerTests, FailOnBadPattern) {
   ObservationCountingQueueController queue_controller(profile());
   GURL url("chrome://settings");
   base::Callback<void(ContentSetting)> callback;
   queue_controller.CreateInfoBarRequest(
       RequestID(0), url, url, callback);
   queue_controller.CancelInfoBarRequest(RequestID(0));
   EXPECT_EQ(0, queue_controller.call_count());
 }