Cleanup WebViewGuest::CanEmbedderAccessGuestView and AppViewGuest::CanEmbedderAccessGuestView

chrome/browser/guest_view/app_view/app_view_guest.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 "chrome/browser/guest_view/app_view/app_view_guest.h"
 
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/guest_view/app_view/app_view_constants.h"
 #include "chrome/browser/guest_view/guest_view_manager.h"
 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/renderer_preferences.h"
 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_host.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace app_runtime = extensions::core_api::app_runtime;
 
@@ skipping 91 matching lines @@
   DCHECK(menu_delegate);
 
   scoped_ptr<RenderViewContextMenu> menu =
       menu_delegate->BuildMenu(guest_web_contents(), params);
   menu_delegate->ShowMenu(menu.Pass());
   return true;
 }
 
 bool AppViewGuest::CanEmbedderUseGuestView(
     const std::string& embedder_extension_id) {
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(browser_context())->extension_service();
   const extensions::Extension* embedder_extension =
-      service->GetExtensionById(embedder_extension_id, false);
-  const extensions::PermissionsData* permissions_data =
-      embedder_extension->permissions_data();
-  return permissions_data->HasAPIPermission(
+      extensions::ExtensionRegistry::Get(browser_context())
+          ->enabled_extensions()
+          .GetByID(embedder_extension_id);
+  if (!embedder_extension)
+    return false;
+  return embedder_extension->permissions_data()->HasAPIPermission(
       extensions::APIPermission::kAppView);
 }
 
 void AppViewGuest::CreateWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
     const base::DictionaryValue& create_params,
     const WebContentsCreatedCallback& callback) {
   std::string app_id;
   if (!create_params.GetString(appview::kAppID, &app_id)) {
@@ skipping 92 matching lines @@
     return;
   }
 
   scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue());
   embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID());
   embed_request->SetString(appview::kEmbedderID, embedder_extension_id());
   extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(
       browser_context(), embed_request.Pass(), extension_host->extension());
 }