Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1330)

Unified Diff: chrome/browser/extensions/isolated_app_browsertest.cc

Issue 2527133002: Remove some WebContents::GetRenderViewHost() calls. (Closed)
Patch Set: More reverts for the same reason as patch set 3, fixes merge conflict Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/isolated_app_browsertest.cc
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc
index 0da8f0c836b63bb33dead7eb9951a953c1e0e563..6dfe9e5dae9058e9aebbf049052eea3e41289a71 100644
--- a/chrome/browser/extensions/isolated_app_browsertest.cc
+++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -15,8 +15,8 @@
#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"
@@ -33,7 +33,6 @@
using content::ExecuteScript;
using content::ExecuteScriptAndExtractString;
using content::NavigationController;
-using content::RenderViewHost;
using content::WebContents;
namespace extensions {
@@ -119,8 +118,9 @@ class IsolatedAppTest : public ExtensionBrowserTest {
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 =

Powered by Google App Engine
This is Rietveld 408576698