Move GuestView layer in browser to components

chrome/browser/devtools/devtools_target_impl.cc

 // 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/devtools/devtools_target_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "components/guest_view/browser/guest_view_base.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/guest_view/guest_view_base.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/constants.h"
 
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using content::RenderViewHost;
 using content::WebContents;
 using content::WorkerService;
 
 const char DevToolsTargetImpl::kTargetTypeApp[] = "app";
@@ skipping 28 matching lines @@
     : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(web_contents)),
       tab_id_(-1) {
   set_type(kTargetTypeOther);
 
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
   if (entry != NULL && entry->GetURL().is_valid())
     set_favicon_url(entry->GetFavicon().url);
   set_last_activity_time(web_contents->GetLastActiveTime());
 
-  extensions::GuestViewBase* guest =
-      extensions::GuestViewBase::FromWebContents(web_contents);
-  WebContents* guest_contents = guest ? guest->embedder_web_contents() : NULL;
+  guestview::GuestViewBase* guest =
+      guestview::GuestViewBase::FromWebContents(web_contents);
+  WebContents* guest_contents = guest ? guest->owner_web_contents() : NULL;
   if (guest_contents) {
     set_type(kTargetTypeWebView);
     set_parent_id(DevToolsAgentHost::GetOrCreateFor(guest_contents)->GetId());
     return;
   }
 
   if (is_tab) {
     set_type(kTargetTypePage);
     tab_id_ = extensions::ExtensionTabUtil::GetTabId(web_contents);
     return;
@@ skipping 215 matching lines @@
       case DevToolsAgentHost::TYPE_SERVICE_WORKER:
         result.push_back(new WorkerTarget(agent_host));
         break;
       default:
         break;
     }
   }
 
   callback.Run(result);
 }