<webview>: Move NewWindow API to chrome

<webview>: Move NewWindow API to chrome

This CL moves the New Window API and navigation to chrome.

This CL removes a lot of unnecessary content APIs for BrowserPlugin now that permissions no longer live in content.

Up next, in a separate CL will be a huge cleanup that removes all WebContentsDelegate code out of BrowserPluginGuest and into WebViewGuest. This should significantly reduce the size of the BrowserPlugin content API.

BUG=364141, 330264
TBR=kenrb@chromium.org for trivial browser_plugin_messages.h change.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271703

[lazyboy, 2014-05-12 23:00:20]

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/guest_view_base.cc (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/guest_view_base.cc:167:
destruction_callback_.Run(guest_web_contents());
Will destruction_callback_ be always set?
Prefer a DCHECK(!destruction_callback_.is_null());

Otherwise
if (!destruction_callback_.is_null()) .. Run(..);

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/guest_view_base.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/guest_view_base.h:162:
scoped_ptr<base::DictionaryValue> extra_params_;
A bit of desc + a typical example of what this dictionary may contain.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/web_view/web_view_guest.cc (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/web_view/web_view_guest.cc:213:
UserMetricsAction("WebView.PermissionAllow.Download"));
There are some issues with renaming uma? I think it is not preferred to rename
them, otherwise you lose track of old data.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/web_view/web_view_guest.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/web_view/web_view_guest.h:192: int
new_window_instance_id,
Can fit in previous line, indentation is off.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/test/data/...
File chrome/test/data/extensions/platform_apps/web_view/shim/main.js (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/test/data/...
chrome/test/data/extensions/platform_apps/web_view/shim/main.js:914:
window.console.log('new window call');
Remove

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
File content/browser/browser_plugin/browser_plugin_guest.cc (left):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
content/browser/browser_plugin/browser_plugin_guest.cc:832:
request_info.Set(browser_plugin::kInitialHeight,
Remove these from browser_plugin_constants.cc

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
File content/browser/browser_plugin/browser_plugin_guest.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
content/browser/browser_plugin/browser_plugin_guest.h:164: // DONE
Need to clean these up.

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
File content/public/browser/browser_plugin_guest_delegate.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
content/public/browser/browser_plugin_guest_delegate.h:122: // Creates a new tab
with the already-created WebContents 'new_contents'.
s/'new_contents'/|new_contents|

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
content/public/browser/browser_plugin_guest_delegate.h:141: 
Add continuing //

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
File content/public/browser/web_contents.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
content/public/browser/web_contents.h:97: bool opener_suppressed;
Add desc.

[Fady Samuel, 2014-05-13 18:59:02]

PTAL

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/guest_view_base.cc (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/guest_view_base.cc:167:
destruction_callback_.Run(guest_web_contents());
On 2014/05/12 23:00:20, lazyboy wrote:
> Will destruction_callback_ be always set?
> Prefer a DCHECK(!destruction_callback_.is_null());
> 
> Otherwise
> if (!destruction_callback_.is_null()) .. Run(..);

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/guest_view_base.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/guest_view_base.h:162:
scoped_ptr<base::DictionaryValue> extra_params_;
On 2014/05/12 23:00:20, lazyboy wrote:
> A bit of desc + a typical example of what this dictionary may contain.

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/web_view/web_view_guest.cc (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/web_view/web_view_guest.cc:213:
UserMetricsAction("WebView.PermissionAllow.Download"));
On 2014/05/12 23:00:20, lazyboy wrote:
> There are some issues with renaming uma? I think it is not preferred to rename
> them, otherwise you lose track of old data.

It doesn't make sense to keep calling them BrowserPlugin though if BrowserPlugin
is going away.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
File chrome/browser/guest_view/web_view/web_view_guest.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/browser/gu...
chrome/browser/guest_view/web_view/web_view_guest.h:192: int
new_window_instance_id,
On 2014/05/12 23:00:20, lazyboy wrote:
> Can fit in previous line, indentation is off.

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/test/data/...
File chrome/test/data/extensions/platform_apps/web_view/shim/main.js (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/chrome/test/data/...
chrome/test/data/extensions/platform_apps/web_view/shim/main.js:914:
window.console.log('new window call');
On 2014/05/12 23:00:20, lazyboy wrote:
> Remove

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
File content/browser/browser_plugin/browser_plugin_guest.cc (left):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
content/browser/browser_plugin/browser_plugin_guest.cc:832:
request_info.Set(browser_plugin::kInitialHeight,
On 2014/05/12 23:00:20, lazyboy wrote:
> Remove these from browser_plugin_constants.cc

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
File content/browser/browser_plugin/browser_plugin_guest.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/browser/b...
content/browser/browser_plugin/browser_plugin_guest.h:164: // DONE
On 2014/05/12 23:00:20, lazyboy wrote:
> Need to clean these up.

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
File content/public/browser/browser_plugin_guest_delegate.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
content/public/browser/browser_plugin_guest_delegate.h:122: // Creates a new tab
with the already-created WebContents 'new_contents'.
On 2014/05/12 23:00:20, lazyboy wrote:
> s/'new_contents'/|new_contents|

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
content/public/browser/browser_plugin_guest_delegate.h:141: 
On 2014/05/12 23:00:20, lazyboy wrote:
> Add continuing //

Done.

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
File content/public/browser/web_contents.h (right):

https://chromiumcodereview.appspot.com/272573005/diff/60001/content/public/br...
content/public/browser/web_contents.h:97: bool opener_suppressed;
On 2014/05/12 23:00:20, lazyboy wrote:
> Add desc.

Done.

[lazyboy, 2014-05-13 19:08:28]

lgtm

[Fady Samuel, 2014-05-13 19:12:09]

Hi John, could you please take a look at the content/public changes?

The additions to BrowserPluginGuestDelegate are mostly temporary. Once all
WebContentDelegate methods are handled in chrome, BrowserPluginGuest will no
longer be a WebContentsDelegate and we will be able to delete a huge chunk of
code in content/public and BrowserPluginGuest.

Thanks!

Fady

[jam, 2014-05-13 21:38:24]

(just looked at content/public)

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
File content/public/browser/browser_plugin_guest_delegate.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
content/public/browser/browser_plugin_guest_delegate.h:159: const
DestructionCallback& callback) {}
can you comment which of these methods (and also the existing ones) will be
removed once WCD moves to chrome?

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
File content/public/browser/child_process_security_policy.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
content/public/browser/child_process_security_policy.h:43: // Returns true iff
|scheme| has been registered as a pseudo-scheme
do we really want to expose this concept outside content? i.e. can you hide
this? i looked at WGV::Navigate which calls this, and I don't understand what
the security issue is re navigating a webview to about, javascript, or
viewsource schemes?

[jam, 2014-05-13 21:38:24]

(just looked at content/public)

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
File content/public/browser/browser_plugin_guest_delegate.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
content/public/browser/browser_plugin_guest_delegate.h:159: const
DestructionCallback& callback) {}
can you comment which of these methods (and also the existing ones) will be
removed once WCD moves to chrome?

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
File content/public/browser/child_process_security_policy.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
content/public/browser/child_process_security_policy.h:43: // Returns true iff
|scheme| has been registered as a pseudo-scheme
do we really want to expose this concept outside content? i.e. can you hide
this? i looked at WGV::Navigate which calls this, and I don't understand what
the security issue is re navigating a webview to about, javascript, or
viewsource schemes?

[Fady Samuel, 2014-05-15 20:02:56]

Addressed John's comments.

PTAL

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
File content/public/browser/browser_plugin_guest_delegate.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
content/public/browser/browser_plugin_guest_delegate.h:159: const
DestructionCallback& callback) {}
On 2014/05/13 21:38:25, jam wrote:
> can you comment which of these methods (and also the existing ones) will be
> removed once WCD moves to chrome?

I've commented on the ones which will definitely be gone when BrowserPluginGuest
is no longer and WebContentsDelegate. I haven't thought carefully about the rest
yet.

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
File content/public/browser/child_process_security_policy.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
content/public/browser/child_process_security_policy.h:43: // Returns true iff
|scheme| has been registered as a pseudo-scheme
On 2014/05/13 21:38:25, jam wrote:
> do we really want to expose this concept outside content? i.e. can you hide
> this? i looked at WGV::Navigate which calls this, and I don't understand what
> the security issue is re navigating a webview to about, javascript, or
> viewsource schemes?

We need to support about:, but that's it. We don't need to expose this. Removed.

[Fady Samuel, 2014-05-15 20:02:56]

Addressed John's comments.

PTAL

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
File content/public/browser/browser_plugin_guest_delegate.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/b...
content/public/browser/browser_plugin_guest_delegate.h:159: const
DestructionCallback& callback) {}
On 2014/05/13 21:38:25, jam wrote:
> can you comment which of these methods (and also the existing ones) will be
> removed once WCD moves to chrome?

I've commented on the ones which will definitely be gone when BrowserPluginGuest
is no longer and WebContentsDelegate. I haven't thought carefully about the rest
yet.

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
File content/public/browser/child_process_security_policy.h (right):

https://codereview.chromium.org/272573005/diff/80001/content/public/browser/c...
content/public/browser/child_process_security_policy.h:43: // Returns true iff
|scheme| has been registered as a pseudo-scheme
On 2014/05/13 21:38:25, jam wrote:
> do we really want to expose this concept outside content? i.e. can you hide
> this? i looked at WGV::Navigate which calls this, and I don't understand what
> the security issue is re navigating a webview to about, javascript, or
> viewsource schemes?

We need to support about:, but that's it. We don't need to expose this. Removed.

[jam, 2014-05-15 21:32:41]

lgtm

[Fady Samuel, 2014-05-15 22:12:26]

The CQ bit was checked by fsamuel@chromium.org

[commit-bot: I haz the power, 2014-05-15 22:14:06]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/100001

[commit-bot: I haz the power, 2014-05-15 23:15:49]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...)
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
  ios_dbg_simulator on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_dbg_simulator/bui...)
  ios_rel_device on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device/builds...)
  ios_rel_device_ninja on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device_ninja/...)
  linux_chromium_chromeos_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_clang_...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)
  linux_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)

[commit-bot: I haz the power, 2014-05-15 23:23:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-15 23:23:42]

Try jobs failed on following builders:
  android_chromium_gn_compile_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_chromium_gn_c...)
  chromium_presubmit on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/bu...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_clang_...)
  linux_chromium_gn_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_gn_rel...)
  linux_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)

[fsamuel, 2014-05-15 23:31:47]

The CQ bit was checked by fsamuel@google.com

[commit-bot: I haz the power, 2014-05-15 23:32:43]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/120001

[commit-bot: I haz the power, 2014-05-16 02:57:38]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)
  android_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_dbg/builds/18...)
  linux_chromium_chromeos_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_clang_...)
  linux_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)
  mac_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_compile_...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_compile_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)
  linux_gpu on tryserver.chromium.gpu
(http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/...)

[commit-bot: I haz the power, 2014-05-16 03:10:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 03:10:08]

Try jobs failed on following builders:
  android_clang_dbg on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/bui...)

[Fady Samuel, 2014-05-16 11:14:41]

The CQ bit was checked by fsamuel@chromium.org

[commit-bot: I haz the power, 2014-05-16 11:15:12]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/140001

[commit-bot: I haz the power, 2014-05-16 13:00:32]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
  linux_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)
  win_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_rel/buil...)
  win_chromium_x64_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_x64_rel/...)

[commit-bot: I haz the power, 2014-05-16 13:24:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 13:24:43]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[Fady Samuel, 2014-05-16 14:36:59]

The CQ bit was checked by fsamuel@chromium.org

[commit-bot: I haz the power, 2014-05-16 14:37:31]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/160001

[commit-bot: I haz the power, 2014-05-16 18:15:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 18:15:51]

Failed to apply patch for chrome/browser/devtools/devtools_targets_ui.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/devtools/devtools_targets_ui.cc
  Hunk #2 FAILED at 78.
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/devtools/devtools_targets_ui.cc.rej

Patch:       chrome/browser/devtools/devtools_targets_ui.cc
Index: chrome/browser/devtools/devtools_targets_ui.cc
diff --git a/chrome/browser/devtools/devtools_targets_ui.cc
b/chrome/browser/devtools/devtools_targets_ui.cc
index
5f602758a65a91fbabc639d7f4757eabcec0fed6..1fa4d806aaaa9677ef8c4ee4764a429e2e5e6530
100644
--- a/chrome/browser/devtools/devtools_targets_ui.cc
+++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -11,6 +11,7 @@
 #include "base/version.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
+#include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/browser_thread.h"
@@ -77,7 +78,7 @@ class CancelableTimer {
         FROM_HERE,
         base::Bind(&CancelableTimer::Fire, weak_factory_.GetWeakPtr()),
         delay);
-  };
+  }
 
  private:
   void Fire() { callback_.Run(); }
@@ -175,9 +176,10 @@ void RenderViewHostTargetsUIHandler::UpdateTargets() {
     RenderFrameHost* rfh = (*it);
     RenderFrameHost* parent_rfh = NULL;
     content::RenderViewHost* rvh = rfh->GetRenderViewHost();
-    if (rvh->GetProcess()->IsGuest()) {
-      WebContents* nested_web_contents = WebContents::FromRenderViewHost(rvh);
-      WebContents* embedder = nested_web_contents->GetEmbedderWebContents();
+    WebContents* nested_web_contents = WebContents::FromRenderViewHost(rvh);
+    GuestViewBase* guest = GuestViewBase::FromWebContents(nested_web_contents);
+    if (guest) {
+      WebContents* embedder = guest->embedder_web_contents();
       parent_rfh = embedder->GetRenderViewHost()->GetMainFrame();
     } else {
       parent_rfh = rfh->GetParent();

[fsamuel, 2014-05-16 21:09:25]

The CQ bit was checked by fsamuel@google.com

[commit-bot: I haz the power, 2014-05-16 21:10:41]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/180001

[commit-bot: I haz the power, 2014-05-17 12:45:35]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-05-17 17:43:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-17 17:43:19]

Try jobs failed on following builders:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[Fady Samuel, 2014-05-17 22:28:42]

The CQ bit was checked by fsamuel@chromium.org

[commit-bot: I haz the power, 2014-05-17 22:29:04]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/180001

[commit-bot: I haz the power, 2014-05-17 22:34:02]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[commit-bot: I haz the power, 2014-05-17 22:38:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-17 22:38:43]

Try jobs failed on following builders:
  mac_chromium_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/mac_chromium_rel/buil...)

[fsamuel, 2014-05-20 14:53:03]

The CQ bit was checked by fsamuel@google.com

[commit-bot: I haz the power, 2014-05-20 14:53:38]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/fsamuel@chromium.org/272573005/200001

[commit-bot: I haz the power, 2014-05-20 17:59:09]

Change committed as 271703