AppView internal API doesn't need to go through ExtensionsAPIClient anymore,...

AppView internal API doesn't need to go through ExtensionsAPIClient anymore, since AppView is now in extensions.

BUG=352290

Review URL: https://codereview.chromium.org/498303002

Cr-Commit-Position: refs/heads/master@{#292477}

chrome/browser/extensions/api/chrome_extensions_api_client.cc

@@ -43,27 +43,6 @@ void ChromeExtensionsAPIClient::AddAdditionalValueStoreCaches(
 #endif
 }
 
-bool ChromeExtensionsAPIClient::AppViewInternalAttachFrame(
-    content::BrowserContext* browser_context,
-    const GURL& url,
-    int guest_instance_id,
-    const std::string& guest_extension_id) {
-  return AppViewGuest::CompletePendingRequest(browser_context,
-                                              url,
-                                              guest_instance_id,
-                                              guest_extension_id);
-}
-
-bool ChromeExtensionsAPIClient::AppViewInternalDenyRequest(
-    content::BrowserContext* browser_context,
-    int guest_instance_id,
-    const std::string& guest_extension_id) {
-  return AppViewGuest::CompletePendingRequest(browser_context,
-                                              GURL(),
-                                              guest_instance_id,
-                                              guest_extension_id);
-}
-
 AppViewGuestDelegate* ChromeExtensionsAPIClient::CreateAppViewGuestDelegate()
     const {
   return new ChromeAppViewGuestDelegate();

chrome/browser/extensions/api/chrome_extensions_api_client.h

@@ -24,15 +24,6 @@ class ChromeExtensionsAPIClient : public ExtensionsAPIClient {
       const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& observers,
       std::map<settings_namespace::Namespace, ValueStoreCache*>* caches)
       OVERRIDE;
-  virtual bool AppViewInternalAttachFrame(
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      int guest_instance_id,
-      const std::string& guest_extension_id) OVERRIDE;
-  virtual bool AppViewInternalDenyRequest(
-      content::BrowserContext* browser_context,
-      int guest_instance_id,
-      const std::string& guest_extension_id) OVERRIDE;
   virtual AppViewGuestDelegate* CreateAppViewGuestDelegate() const OVERRIDE;
   virtual WebViewGuestDelegate* CreateWebViewGuestDelegate(
       WebViewGuest* web_view_guest) const OVERRIDE;

extensions/browser/api/app_view/app_view_internal_api.cc

@@ -4,7 +4,7 @@
 
 #include "extensions/browser/api/app_view/app_view_internal_api.h"
 
-#include "extensions/browser/api/extensions_api_client.h"
+#include "extensions/browser/guest_view/app_view/app_view_guest.h"
 #include "extensions/common/api/app_view_internal.h"
 
 
@@ -24,12 +24,10 @@ bool AppViewInternalAttachFrameFunction::RunAsync() {
   GURL url = extension()->GetResourceURL(params->url);
   EXTENSION_FUNCTION_VALIDATE(url.is_valid());
 
-  ExtensionsAPIClient* extensions_client = ExtensionsAPIClient::Get();
-  return extensions_client->AppViewInternalAttachFrame(
-      browser_context(),
-      url,
-      params->guest_instance_id,
-      extension_id());
+  return AppViewGuest::CompletePendingRequest(browser_context(),
+                                              url,
+                                              params->guest_instance_id,
+                                              extension_id());
 }
 
 AppViewInternalDenyRequestFunction::
@@ -41,13 +39,12 @@ bool AppViewInternalDenyRequestFunction::RunAsync() {
       appview::DenyRequest::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  ExtensionsAPIClient* extensions_client = ExtensionsAPIClient::Get();
   // Since the URL passed into AppViewGuest:::CompletePendingRequest is invalid,
   // a new <appview> WebContents will not be created.
-  return extensions_client->AppViewInternalDenyRequest(
-      browser_context(),
-      params->guest_instance_id,
-      extension_id());
+  return AppViewGuest::CompletePendingRequest(browser_context(),
+                                              GURL(),
+                                              params->guest_instance_id,
+                                              extension_id());
 }
 
 }  // namespace extensions

extensions/browser/api/extensions_api_client.cc

@@ -26,21 +26,6 @@ void ExtensionsAPIClient::AddAdditionalValueStoreCaches(
     const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& observers,
     std::map<settings_namespace::Namespace, ValueStoreCache*>* caches) {}
 
-bool ExtensionsAPIClient::AppViewInternalAttachFrame(
-    content::BrowserContext* browser_context,
-    const GURL& url,
-    int guest_instance_id,
-    const std::string& guest_extension_id) {
-  return false;
-}
-
-bool ExtensionsAPIClient::AppViewInternalDenyRequest(
-    content::BrowserContext* browser_context,
-    int guest_instance_id,
-    const std::string& guest_extension_id) {
-  return false;
-}
-
 AppViewGuestDelegate* ExtensionsAPIClient::CreateAppViewGuestDelegate() const {
   return NULL;
 }

extensions/browser/api/extensions_api_client.h

@@ -58,21 +58,6 @@ class ExtensionsAPIClient {
       const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& observers,
       std::map<settings_namespace::Namespace, ValueStoreCache*>* caches);
 
-  // Attaches a frame |url| inside the <appview> specified by
-  // |guest_instance_id|. Returns true if the operation completes succcessfully.
-  virtual bool AppViewInternalAttachFrame(
-      content::BrowserContext* browser_context,
-      const GURL& url,
-      int guest_instance_id,
-      const std::string& guest_extension_id);
-
-  // Denies the embedding requested by the <appview> specified by
-  // |guest_instance_id|. Returns true if the operation completes successfully.
-  virtual bool AppViewInternalDenyRequest(
-      content::BrowserContext* browser_context,
-      int guest_instance_id,
-      const std::string& guest_extension_id);
-
   // Creates the AppViewGuestDelegate.
   virtual AppViewGuestDelegate* CreateAppViewGuestDelegate() const;