diff options
| author | paulmeyer <paulmeyer@chromium.org> | 2015-06-16 11:25:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-16 18:25:46 +0000 |
| commit | 1aeba7aa82e4f0aca479c340cdfeb425ba592db6 (patch) | |
| tree | a8b7bbf6496771410e7a09dd8c420d6925f73d37 /extensions | |
| parent | 459965540dc14300815318707170a5bd5f36640d (diff) | |
| download | chromium_src-1aeba7aa82e4f0aca479c340cdfeb425ba592db6.zip chromium_src-1aeba7aa82e4f0aca479c340cdfeb425ba592db6.tar.gz chromium_src-1aeba7aa82e4f0aca479c340cdfeb425ba592db6.tar.bz2 | |
Renamed RenderProcessHost::IsIsolatedGuest() to RenderProcessHost::IsForGuestsOnly().
BUG=499133
TBR=kalman@chromium.org for user_script_loader.cc
Review URL: https://codereview.chromium.org/1191573002
Cr-Commit-Position: refs/heads/master@{#334642}
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/browser/guest_view/web_view/web_view_apitest.cc | 2 | ||||
| -rw-r--r-- | extensions/browser/guest_view/web_view/web_view_guest.cc | 2 | ||||
| -rw-r--r-- | extensions/browser/user_script_loader.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index 26e91b1..061ec3d5 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc @@ -662,7 +662,7 @@ IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestRemoveWebviewOnExit) { "runTest('testRemoveWebviewOnExit')")); content::WebContents* guest_web_contents = GetGuestWebContents(); - EXPECT_TRUE(guest_web_contents->GetRenderProcessHost()->IsIsolatedGuest()); + EXPECT_TRUE(guest_web_contents->GetRenderProcessHost()->IsForGuestsOnly()); ASSERT_TRUE(guest_loaded_listener.WaitUntilSatisfied()); content::WebContentsDestroyedWatcher destroyed_watcher(guest_web_contents); diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc index 4f49eb6..6d7a4c2 100644 --- a/extensions/browser/guest_view/web_view/web_view_guest.cc +++ b/extensions/browser/guest_view/web_view/web_view_guest.cc @@ -441,7 +441,7 @@ void WebViewGuest::GuestDestroyed() { void WebViewGuest::GuestReady() { // The guest RenderView should always live in an isolated guest process. - CHECK(web_contents()->GetRenderProcessHost()->IsIsolatedGuest()); + CHECK(web_contents()->GetRenderProcessHost()->IsForGuestsOnly()); Send(new ExtensionMsg_SetFrameName(web_contents()->GetRoutingID(), name_)); // We don't want to accidentally set the opacity of an interstitial page. diff --git a/extensions/browser/user_script_loader.cc b/extensions/browser/user_script_loader.cc index 047080a..39e1ee8 100644 --- a/extensions/browser/user_script_loader.cc +++ b/extensions/browser/user_script_loader.cc @@ -380,7 +380,7 @@ void UserScriptLoader::SendUpdate(content::RenderProcessHost* process, const std::set<HostID>& changed_hosts) { // Don't allow injection of non-whitelisted extensions' content scripts // into <webview>. - bool whitelisted_only = process->IsIsolatedGuest() && host_id().id().empty(); + bool whitelisted_only = process->IsForGuestsOnly() && host_id().id().empty(); // Make sure we only send user scripts to processes in our browser_context. if (!ExtensionsBrowserClient::Get()->IsSameContext( |