Remove some WebContents::GetRenderViewHost() calls.

chrome/browser/extensions/isolated_app_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 <stddef.h>
 #include <utility>
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_apitest.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/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_types.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/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/common/switches.h"
 #include "net/base/escape.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 
 using content::ExecuteScript;
 using content::ExecuteScriptAndExtractString;
 using content::NavigationController;
-using content::RenderViewHost;
 using content::WebContents;
 
 namespace extensions {
 
 namespace {
 
 std::string WrapForJavascriptAndExtract(const char* javascript_expression) {
   return std::string("window.domAutomationController.send(") +
       javascript_expression + ")";
 }
@@ skipping 65 matching lines @@
     std::string actual_cookie;
     ui_test_utils::GetCookies(contents->GetURL(), contents, &value_size,
                               &actual_cookie);
     return actual_cookie.find(cookie) != std::string::npos;
   }
 
   const Extension* GetInstalledApp(WebContents* contents) {
     content::BrowserContext* browser_context = contents->GetBrowserContext();
     ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context);
     std::set<std::string> extension_ids =
-        ProcessMap::Get(browser_context)->GetExtensionsInProcess(
-            contents->GetRenderViewHost()->GetProcess()->GetID());
+        ProcessMap::Get(browser_context)
+            ->GetExtensionsInProcess(
+                contents->GetMainFrame()->GetProcess()->GetID());
     for (std::set<std::string>::iterator iter = extension_ids.begin();
          iter != extension_ids.end(); ++iter) {
       const Extension* installed_app =
           registry->enabled_extensions().GetByID(*iter);
       if (installed_app && installed_app->is_app())
         return installed_app;
     }
     return NULL;
   }
 
@@ skipping 430 matching lines @@
       browser(), base_url.Resolve("non_app/main.html"));
   ASSERT_TRUE(ExecuteScriptAndExtractString(
       browser()->tab_strip_model()->GetWebContentsAt(0),
       kRetrieveSessionStorage.c_str(), &result));
   EXPECT_EQ("ss_normal", result);
 }
 
 }  // namespace
 
 }  // namespace extensions