Decouple GuestView creation from attachment.

Decouple GuestView creation from attachment.

This enables attaching the GuestView earlier on prior to loading resources.

Loading events that occur prior to attachment
are queued until attachment and then sent to the embedder on attachment.

This CL also moves loadstop from content to chrome. Existing tests exercise the need for queuing.

BUG=166165
Test=WebViewTest.Shim (newwindow tests)

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

[lazyboy, 2013-06-25 14:48:57]

I'll review this one once you have the other dependent CL landed.

https://chromiumcodereview.appspot.com/17624004/diff/2001/chrome/browser/chro...
File chrome/browser/chrome_content_browser_client.cc (right):

https://chromiumcodereview.appspot.com/17624004/diff/2001/chrome/browser/chro...
chrome/browser/chrome_content_browser_client.cc:720: NOTREACHED();
log error message.

[Fady Samuel, 2013-06-25 22:54:51]

This now implements loadstop too. I added the event queue so that any event that
arrives prior to attachment is queued up until attachment and then fired on
attachment.

[lazyboy, 2013-06-26 16:41:16]

Looks alright, one q about the description:
"Existing tests exercise the need for queuing." -> can you add a comment in the
test where it requires queueing? It is probably good to also extract that to a
separate test so it is obvious if we have a regression here. Ty.

https://codereview.chromium.org/17624004/diff/17001/content/browser/web_conte...
File content/browser/web_contents/web_contents_impl.cc (right):

https://codereview.chromium.org/17624004/diff/17001/content/browser/web_conte...
content/browser/web_contents/web_contents_impl.cc:443:
GetContentClient()->browser()->GuestWebContentsCreated(
Why is it here and and not right after BrowserPluginGuest::Create call? Does it
need to be called after Init?
If not, then I think it is better to move GuestWebContentsCreated() calls inside
Create* methods (for here and below) and if there is a chance of race, then add
comments saying why.

https://codereview.chromium.org/17624004/diff/17001/content/public/browser/co...
File content/public/browser/content_browser_client.h (right):

https://codereview.chromium.org/17624004/diff/17001/content/public/browser/co...
content/public/browser/content_browser_client.h:138: virtual void
GuestWebContentsCreated(
Comment on what guest web contents is and when this is fired

[Fady Samuel, 2013-06-27 17:07:09]

PTAL

https://codereview.chromium.org/17624004/diff/17001/content/browser/web_conte...
File content/browser/web_contents/web_contents_impl.cc (right):

https://codereview.chromium.org/17624004/diff/17001/content/browser/web_conte...
content/browser/web_contents/web_contents_impl.cc:443:
GetContentClient()->browser()->GuestWebContentsCreated(
On 2013/06/26 16:41:16, lazyboy wrote:
> Why is it here and and not right after BrowserPluginGuest::Create call? Does
it
> need to be called after Init?
> If not, then I think it is better to move GuestWebContentsCreated() calls
inside
> Create* methods (for here and below) and if there is a chance of race, then
add
> comments saying why.

Done.

https://codereview.chromium.org/17624004/diff/17001/content/public/browser/co...
File content/public/browser/content_browser_client.h (right):

https://codereview.chromium.org/17624004/diff/17001/content/public/browser/co...
content/public/browser/content_browser_client.h:138: virtual void
GuestWebContentsCreated(
On 2013/06/26 16:41:16, lazyboy wrote:
> Comment on what guest web contents is and when this is fired

Done.

[lazyboy, 2013-06-27 17:49:52]

lgtm

One comment not addressed:
"Existing tests exercise the need for queuing." -> can you add a comment in the
test where it requires queueing? It is probably good to also extract that to a
separate test so it is obvious if we have a regression here.

[Fady Samuel, 2013-06-27 19:13:06]

Comment addressed. I also fixed a subtle bug in when the queued events fire.

[lazyboy, 2013-06-27 19:31:11]

lgtm

https://chromiumcodereview.appspot.com/17624004/diff/38001/content/browser/br...
File content/browser/browser_plugin/browser_plugin_embedder.cc (right):

https://chromiumcodereview.appspot.com/17624004/diff/38001/content/browser/br...
content/browser/browser_plugin/browser_plugin_embedder.cc:187:
guest->Attach(static_cast<WebContentsImpl*>(web_contents()), params);
Add a comment about order of calling
we expect
guestview->Attach
bpguest->Attach
process queued events.

[Fady Samuel, 2013-06-28 17:18:54]

+jam@ for review of:

content/public/browser/content_browser_client.h
content/browser/web_contents/*
chrome/browser/chrome_content_browser_client.cc
chrome/browser/chrome_content_browser_client.h

Thanks!

[jam, 2013-06-28 20:46:47]

ok, but I don't really understand all the guest stuff now so please have Charlie
sign off on this

[Charlie Reis, 2013-06-28 21:59:59]

Just looking at web_contents_impl and content_browser_client.  Looks like you're
mainly notifying the client when a guest is created, which seems fine.

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
File content/browser/web_contents/web_contents_impl.cc (right):

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
content/browser/web_contents/web_contents_impl.cc:3678:
browser_plugin_guest_.reset(guest);
Do you ever expect this to change after it's set?  If not, should we have a
DCHECK or CHECK that it's null before this?

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
File content/browser/web_contents/web_contents_impl.h (right):

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
content/browser/web_contents/web_contents_impl.h:163: void
SetBrowserPluginGuest(BrowserPluginGuest* guest);
This deserves a separate comment, since it's not clear to others (e.g., John)
what it is for.

https://codereview.chromium.org/17624004/diff/46001/content/public/browser/co...
File content/public/browser/content_browser_client.h (right):

https://codereview.chromium.org/17624004/diff/46001/content/public/browser/co...
content/public/browser/content_browser_client.h:143: // will be non-NULL.
This doesn't explain what extra_params is for, though.  Is it navigation
parameters?

https://codereview.chromium.org/17624004/diff/46001/content/public/browser/co...
content/public/browser/content_browser_client.h:145: WebContents*
opener_web_contents,
It might be clearer if guest_web_contents was listed first, since
opener_web_contents appears to be somewhat optional.

[Fady Samuel, 2013-06-28 22:24:41]

Addressed comments. PTAL.

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
File content/browser/web_contents/web_contents_impl.cc (right):

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
content/browser/web_contents/web_contents_impl.cc:3678:
browser_plugin_guest_.reset(guest);
On 2013/06/28 21:59:59, creis wrote:
> Do you ever expect this to change after it's set?  If not, should we have a
> DCHECK or CHECK that it's null before this?

Done.

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
File content/browser/web_contents/web_contents_impl.h (right):

https://codereview.chromium.org/17624004/diff/46001/content/browser/web_conte...
content/browser/web_contents/web_contents_impl.h:163: void
SetBrowserPluginGuest(BrowserPluginGuest* guest);
On 2013/06/28 21:59:59, creis wrote:
> This deserves a separate comment, since it's not clear to others (e.g., John)
> what it is for.

Done.

https://codereview.chromium.org/17624004/diff/46001/content/public/browser/co...
File content/public/browser/content_browser_client.h (right):

https://codereview.chromium.org/17624004/diff/46001/content/public/browser/co...
content/public/browser/content_browser_client.h:143: // will be non-NULL.
On 2013/06/28 21:59:59, creis wrote:
> This doesn't explain what extra_params is for, though.  Is it navigation
> parameters?

Done. They are params passed to a BrowserPlugin instantiated by the content
embedder: webview or adview shim for example. I tried to add a comment that
sounds sufficiently generic so as to not refer to chrome specifically.

https://codereview.chromium.org/17624004/diff/46001/content/public/browser/co...
content/public/browser/content_browser_client.h:145: WebContents*
opener_web_contents,
On 2013/06/28 21:59:59, creis wrote:
> It might be clearer if guest_web_contents was listed first, since
> opener_web_contents appears to be somewhat optional.

Done.

[Charlie Reis, 2013-06-28 22:28:06]

Ok, content/browser/web_contents/web_contents_impl.* LGTM.

[Fady Samuel, 2013-06-28 22:34:33]

John, could you please take a look at the (Chrome)ContentBrowserClient changes?

I'm an OWNER for the rest: content/*/browser_plugin, and
chrome/browser/guestview. Thanks.

[jam, 2013-06-28 22:36:09]

lgtm

[commit-bot: I haz the power, 2013-06-28 22:39:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/47004

[commit-bot: I haz the power, 2013-06-28 22:39:26]

Failed to apply patch for chrome/browser/adview/adview_guest.cc:
While running svn delete chrome/browser/adview/adview_guest.cc --force
--config-dir /b/commit-queue/subversion_config --non-interactive;
  svn: 'chrome/browser/adview' is not a working copy
  svn: 'chrome/browser/adview' does not exist

Patch:  D    chrome/browser/adview/adview_guest.cc
Index: chrome/browser/adview/adview_guest.cc
diff --git a/chrome/browser/adview/adview_guest.cc
b/chrome/browser/adview/adview_guest.cc
deleted file mode 100644
index
5d884163b8dd902c3383edb1be373bb96dec22de..0000000000000000000000000000000000000000
--- a/chrome/browser/adview/adview_guest.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 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 "chrome/browser/adview/adview_guest.h"
-
-#include "base/lazy_instance.h"
-#include "chrome/browser/adview/adview_constants.h"
-#include "chrome/browser/extensions/event_router.h"
-#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/site_instance.h"
-#include "content/public/browser/web_contents.h"
-
-using content::WebContents;
-
-AdViewGuest::AdViewGuest(WebContents* guest_web_contents,
-                         WebContents* embedder_web_contents,
-                         const std::string& extension_id,
-                         int view_instance_id,
-                         const base::DictionaryValue& args)
-    : WebContentsObserver(guest_web_contents),
-      embedder_web_contents_(embedder_web_contents),
-      extension_id_(extension_id),
-      embedder_render_process_id_(
-          embedder_web_contents->GetRenderProcessHost()->GetID()),
-      profile_(guest_web_contents->GetBrowserContext()),
-      guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()),
-      view_instance_id_(view_instance_id) {
-  std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
-  adview_guest_map.Get().insert(std::make_pair(key, this));
-}
-
-// static
-AdViewGuest* AdViewGuest::From(int embedder_process_id,
-                               int guest_instance_id) {
-  AdViewGuestMap* guest_map = adview_guest_map.Pointer();
-  AdViewGuestMap::iterator it = guest_map->find(
-      std::make_pair(embedder_process_id, guest_instance_id));
-  return it == guest_map->end() ? NULL : it->second;
-}
-
-AdViewGuest::~AdViewGuest() {
-  std::pair<int, int> key(embedder_render_process_id_, guest_instance_id_);
-  adview_guest_map.Get().erase(key);
-}
-
-void AdViewGuest::DispatchEvent(const std::string& event_name,
-                                 scoped_ptr<DictionaryValue> event) {
-  Profile* profile = Profile::FromBrowserContext(
-      web_contents()->GetBrowserContext());
-
-  extensions::EventFilteringInfo info;
-  info.SetURL(GURL());
-  info.SetInstanceID(guest_instance_id_);
-  scoped_ptr<ListValue> args(new ListValue());
-  args->Append(event.release());
-
-  extensions::EventRouter::DispatchEvent(
-      embedder_web_contents_, profile, extension_id_,
-      event_name, args.Pass(),
-      extensions::EventRouter::USER_GESTURE_UNKNOWN, info);
-}
-
-void AdViewGuest::DidCommitProvisionalLoadForFrame(
-    int64 frame_id,
-    bool is_main_frame,
-    const GURL& url,
-    content::PageTransition transition_type,
-    content::RenderViewHost* render_view_host) {
-  scoped_ptr<DictionaryValue> event(new DictionaryValue());
-  event->SetString(adview::kUrl, url.spec());
-  event->SetBoolean(adview::kIsTopLevel, is_main_frame);
-  DispatchEvent(adview::kEventLoadCommit, event.Pass());
-}
-
-void AdViewGuest::WebContentsDestroyed(WebContents* web_contents) {
-  delete this;
-}

[Fady Samuel, 2013-06-28 22:51:59]

+cdn@ for browser_plugin_messages

[Cris Neckar, 2013-06-28 22:58:09]

rubber stamp lgtm for ipc changes

[commit-bot: I haz the power, 2013-06-28 23:01:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/58002

[commit-bot: I haz the power, 2013-06-29 00:35:17]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_clang_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-29 00:45:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/58002

[commit-bot: I haz the power, 2013-06-29 00:52:41]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac&number...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-29 14:13:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/69002

[commit-bot: I haz the power, 2013-06-29 15:04:25]

Retried try job too often on win_rel for step(s) base_unittests, browser_tests,
cacheinvalidation_unittests, cc_unittests, check_deps, chrome_frame_net_tests,
chrome_frame_tests, chrome_frame_unittests, chromedriver2_unittests,
components_unittests, content_browsertests, content_unittests, crypto_unittests,
gpu_unittests, installer_util_unittests, interactive_ui_tests, ipc_tests,
jingle_unittests, media_unittests, mini_installer_test, nacl_integration,
net_unittests, ppapi_unittests, printing_unittests, remoting_unittests,
sql_unittests, sync_integration_tests, sync_unit_tests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-06-29 15:19:46]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/69002

[commit-bot: I haz the power, 2013-06-29 15:41:46]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-29 16:43:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/69002

[commit-bot: I haz the power, 2013-06-29 17:18:23]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win7_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-29 18:03:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/69002

[commit-bot: I haz the power, 2013-06-29 18:36:32]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win7_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-29 19:08:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/17624004/108001

[commit-bot: I haz the power, 2013-06-29 21:06:59]

Change committed as 209345