AppView: Fix owner_extension_id

extensions/browser/guest_view/guest_view_base.cc

 // Copyright 2014 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 "extensions/browser/guest_view/guest_view_base.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/navigation_details.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/web_contents.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/app_view/app_view_guest.h"
 #include "extensions/browser/guest_view/extension_options/extension_options_guest.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
 #include "extensions/browser/guest_view/surface_worker/surface_worker_guest.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
+#include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using content::WebContents;
 
 namespace content {
@@ skipping 107 matching lines @@
       guest_instance_id_(guest_instance_id),
       view_instance_id_(guestview::kInstanceIDNone),
       element_instance_id_(guestview::kInstanceIDNone),
       initialized_(false),
       is_being_destroyed_(false),
       auto_size_enabled_(false),
       is_full_page_plugin_(false),
       weak_ptr_factory_(this) {
 }
 
-void GuestViewBase::Init(const std::string& owner_extension_id,
-                         const base::DictionaryValue& create_params,
+void GuestViewBase::Init(const base::DictionaryValue& create_params,
                          const WebContentsCreatedCallback& callback) {
   if (initialized_)
     return;
   initialized_ = true;
 
   const Feature* feature = FeatureProvider::GetAPIFeature(GetAPINamespace());
   CHECK(feature);
 
   ProcessMap* process_map = ProcessMap::Get(browser_context());
   CHECK(process_map);
 
-  const Extension* embedder_extension = ExtensionRegistry::Get(browser_context_)
-          ->enabled_extensions()
-          .GetByID(owner_extension_id);
+  const Extension* owner_extension =
+      ProcessManager::Get(owner_web_contents()->GetBrowserContext())->
+          GetExtensionForRenderViewHost(
+              owner_web_contents()->GetRenderViewHost());
+  owner_extension_id_ = owner_extension ? owner_extension->id() : std::string();
 
-  // Ok for |embedder_extension| to be NULL, the embedder might be WebUI.
+  // Ok for |owner_extension| to be NULL, the embedder might be WebUI.
   Feature::Availability availability = feature->IsAvailableToContext(
-      embedder_extension,
+      owner_extension,
       process_map->GetMostLikelyContextType(
-          embedder_extension,
+          owner_extension,
           owner_web_contents()->GetRenderProcessHost()->GetID()),
       GetOwnerSiteURL());
   if (!availability.is_available()) {
     // The derived class did not create a WebContents so this class serves no
     // purpose. Let's self-destruct.
     delete this;
     callback.Run(NULL);
     return;
   }
 
   CreateWebContents(create_params,
                     base::Bind(&GuestViewBase::CompleteInit,
                                weak_ptr_factory_.GetWeakPtr(),
-                               owner_extension_id,
                                callback));
 }
 
 void GuestViewBase::InitWithWebContents(
-    const std::string& owner_extension_id,
     content::WebContents* guest_web_contents) {
   DCHECK(guest_web_contents);
 
-  owner_extension_id_ = owner_extension_id;
-
   // At this point, we have just created the guest WebContents, we need to add
   // an observer to the embedder WebContents. This observer will be responsible
   // for destroying the guest WebContents if the embedder goes away.
   owner_lifetime_observer_.reset(
       new OwnerLifetimeObserver(this, owner_web_contents_));
 
   WebContentsObserver::Observe(guest_web_contents);
   guest_web_contents->SetDelegate(this);
   webcontents_guestview_map.Get().insert(
       std::make_pair(guest_web_contents, this));
@@ skipping 326 matching lines @@
 void GuestViewBase::SendQueuedEvents() {
   if (!attached())
     return;
   while (!pending_events_.empty()) {
     linked_ptr<Event> event_ptr = pending_events_.front();
     pending_events_.pop_front();
     DispatchEventToEmbedder(event_ptr.release());
   }
 }
 
-void GuestViewBase::CompleteInit(const std::string& owner_extension_id,
-                                 const WebContentsCreatedCallback& callback,
+void GuestViewBase::CompleteInit(const WebContentsCreatedCallback& callback,
                                  content::WebContents* guest_web_contents) {
   if (!guest_web_contents) {
     // The derived class did not create a WebContents so this class serves no
     // purpose. Let's self-destruct.
     delete this;
     callback.Run(NULL);
     return;
   }
-  InitWithWebContents(owner_extension_id, guest_web_contents);
+  InitWithWebContents(guest_web_contents);
   callback.Run(guest_web_contents);
 }
 
 void GuestViewBase::StartTrackingEmbedderZoomLevel() {
   if (!ZoomPropagatesFromEmbedderToGuest())
     return;
 
   ui_zoom::ZoomController* zoom_controller =
       ui_zoom::ZoomController::FromWebContents(owner_web_contents());
   // Chrome Apps do not have a ZoomController.
@@ skipping 20 matching lines @@
 // static
 void GuestViewBase::RegisterGuestViewTypes() {
   AppViewGuest::Register();
   ExtensionOptionsGuest::Register();
   MimeHandlerViewGuest::Register();
   SurfaceWorkerGuest::Register();
   WebViewGuest::Register();
 }
 
 }  // namespace extensions