Change allowed bindings to be per RenderFrame instead of per RenderView.

chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.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 <string.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 18 matching lines @@
 #include "components/dom_distiller/core/dom_distiller_store.h"
 #include "components/dom_distiller/core/dom_distiller_switches.h"
 #include "components/dom_distiller/core/dom_distiller_test_util.h"
 #include "components/dom_distiller/core/fake_distiller.h"
 #include "components/dom_distiller/core/fake_distiller_page.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "components/strings/grit/components_strings.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/isolated_world_ids.h"
 #include "content/public/test/browser_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace dom_distiller {
@@ skipping 170 matching lines @@
       ->SetTestingFactoryAndUse(browser()->profile(), &Build);
 
   // Navigate to a URL which the source should respond to.
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Ensure no bindings for the loaded |url|.
   content::WebContents* contents_after_nav =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(contents_after_nav != NULL);
   EXPECT_EQ(url, contents_after_nav->GetLastCommittedURL());
-  const content::RenderViewHost* render_view_host =
-      contents_after_nav->GetRenderViewHost();
-  EXPECT_EQ(0, render_view_host->GetEnabledBindings());
+  const content::RenderFrameHost* render_frame_host =
+      contents_after_nav->GetMainFrame();
+  EXPECT_EQ(0, render_frame_host->GetEnabledBindings());
   EXPECT_EQ(expected_mime_type, contents_after_nav->GetContentsMimeType());
 }
 
 #if defined(OS_LINUX)
 // Flaky on Ubuntu-12.04 bots: https://crbug.com/604362
 #define MAYBE_TestBadUrlErrorPage DISABLED_TestBadUrlErrorPage
 #else
 #define MAYBE_TestBadUrlErrorPage TestBadUrlErrorPage
 #endif
 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
@@ skipping 403 matching lines @@
   EXPECT_EQ("dark serif", result);
   EXPECT_EQ(kDarkToolbarThemeColor, contents->GetThemeColor());
 
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(
       contents, kGetFontSize, &result));
   base::StringToDouble(result, &fontSize);
   ASSERT_FLOAT_EQ(kScale, fontSize/oldFontSize);
 }
 
 }  // namespace dom_distiller