2 files changed, 2 insertions, 16 deletions
diff --git a/apps/shell/common/shell_extensions_client.cc b/apps/shell/common/shell_extensions_client.cc
index 5c142d4..fe01ea3 100644
--- a/apps/shell/common/shell_extensions_client.cc
+++ b/apps/shell/common/shell_extensions_client.cc
@@ -7,8 +7,6 @@
 #include "apps/shell/common/api/generated_schemas.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "chrome/common/extensions/api/generated_schemas.h"
-#include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "extensions/common/api/generated_schemas.h"
 #include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/common_manifest_handlers.h"
@@ -92,8 +90,7 @@ base::LazyInstance<ShellPermissionMessageProvider>
 }  // namespace
 
 ShellExtensionsClient::ShellExtensionsClient()
-    : chrome_api_permissions_(extensions::ChromeAPIPermissions()),
-      extensions_api_permissions_(extensions::ExtensionsAPIPermissions()) {
+    : extensions_api_permissions_(extensions::ExtensionsAPIPermissions()) {
 }
 
 ShellExtensionsClient::~ShellExtensionsClient() {
@@ -111,8 +108,6 @@ void ShellExtensionsClient::Initialize() {
   // TODO(jamescook): Do we need to whitelist any extensions?
 
   extensions::PermissionsInfo::GetInstance()->AddProvider(
-      chrome_api_permissions_);
-  extensions::PermissionsInfo::GetInstance()->AddProvider(
       extensions_api_permissions_);
 }
 
@@ -181,18 +176,12 @@ bool ShellExtensionsClient::IsAPISchemaGenerated(
   // moved out. See http://crbug.com/349042.
   // Special-case our simplified app.runtime implementation because we don't
   // have the Chrome app APIs available.
-  return extensions::api::GeneratedSchemas::IsGenerated(name) ||
-         extensions::core_api::GeneratedSchemas::IsGenerated(name) ||
+  return extensions::core_api::GeneratedSchemas::IsGenerated(name) ||
          apps::shell_api::GeneratedSchemas::IsGenerated(name);
 }
 
 base::StringPiece ShellExtensionsClient::GetAPISchema(
     const std::string& name) const {
-  // TODO(rockot): Remove dependency on src/chrome once we have some core APIs
-  // moved out. See http://crbug.com/349042.
-  if (extensions::api::GeneratedSchemas::IsGenerated(name))
-    return extensions::api::GeneratedSchemas::Get(name);
-
   // Schema for chrome.shell APIs.
   if (apps::shell_api::GeneratedSchemas::IsGenerated(name))
     return apps::shell_api::GeneratedSchemas::Get(name);
diff --git a/apps/shell/common/shell_extensions_client.h b/apps/shell/common/shell_extensions_client.h
index 875ce57..847b4a0 100644
--- a/apps/shell/common/shell_extensions_client.h
+++ b/apps/shell/common/shell_extensions_client.h
@@ -7,7 +7,6 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/extensions_api_permissions.h"
 
@@ -43,8 +42,6 @@ class ShellExtensionsClient : public extensions::ExtensionsClient {
   virtual bool ShouldSuppressFatalErrors() const OVERRIDE;
 
  private:
-  // TODO(yoz): Don't include Chrome permissions.
-  const extensions::ChromeAPIPermissions chrome_api_permissions_;
   const extensions::ExtensionsAPIPermissions extensions_api_permissions_;
 
   ScriptingWhitelist scripting_whitelist_;