Revert of Cleanup: Remove remaining generated extensions APIs on Android.

chrome/common/extensions/chrome_extensions_client.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/common/extensions/chrome_extensions_client.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/extensions/api/generated_schemas.h"
 #include "chrome/common/extensions/chrome_manifest_handlers.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/features/chrome_channel_feature_filter.h"
 #include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/common_resources.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/common/api/generated_schemas.h"
 #include "extensions/common/common_manifest_handlers.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/features/api_feature.h"
 #include "extensions/common/features/base_feature_provider.h"
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/features/json_feature_provider_source.h"
 #include "extensions/common/features/manifest_feature.h"
 #include "extensions/common/features/permission_feature.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/api_permission_set.h"
 #include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "extensions/grit/extensions_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
-// TODO(thestig): Remove these #defines. This file should not be built when
-// extensions are disabled.
 #if defined(ENABLE_EXTENSIONS)
-#include "chrome/common/extensions/api/generated_schemas.h"
 #include "chrome/grit/extensions_api_resources.h"
-#include "extensions/common/api/generated_schemas.h"
 #endif
 
 namespace extensions {
 
 namespace {
 
 // TODO(battre): Delete the HTTP URL once the blacklist is downloaded via HTTPS.
 const char kExtensionBlocklistUrlPrefix[] =
     "http://www.gstatic.com/chrome/extensions/blacklist";
 const char kExtensionBlocklistHttpsUrlPrefix[] =
@@ skipping 20 matching lines @@
 }
 
 ChromeExtensionsClient::~ChromeExtensionsClient() {
 }
 
 void ChromeExtensionsClient::Initialize() {
   // Registration could already be finalized in unit tests, where the utility
   // thread runs in-process.
   if (!ManifestHandler::IsRegistrationFinalized()) {
     RegisterCommonManifestHandlers();
-#if defined(ENABLE_EXTENSIONS)
     RegisterChromeManifestHandlers();
-#endif
     ManifestHandler::FinalizeRegistration();
   }
 
   // Set up permissions.
   PermissionsInfo::GetInstance()->AddProvider(chrome_api_permissions_);
   PermissionsInfo::GetInstance()->AddProvider(extensions_api_permissions_);
 
   // Set up the scripting whitelist.
   // Whitelist ChromeVox, an accessibility extension from Google that needs
   // the ability to script webui pages. This is temporary and is not
@@ skipping 126 matching lines @@
   if (url.host() == store_url.host()) {
     if (error)
       *error = manifest_errors::kCannotScriptGallery;
     return false;
   }
   return true;
 }
 
 bool ChromeExtensionsClient::IsAPISchemaGenerated(
     const std::string& name) const {
-#if defined(ENABLE_EXTENSIONS)
   // Test from most common to least common.
   return api::GeneratedSchemas::IsGenerated(name) ||
          core_api::GeneratedSchemas::IsGenerated(name);
-#else
-  return false;
-#endif
 }
 
 base::StringPiece ChromeExtensionsClient::GetAPISchema(
     const std::string& name) const {
-#if defined(ENABLE_EXTENSIONS)
   // Test from most common to least common.
   if (api::GeneratedSchemas::IsGenerated(name))
     return api::GeneratedSchemas::Get(name);
 
   return core_api::GeneratedSchemas::Get(name);
-#else
-  return base::StringPiece();
-#endif
 }
 
 void ChromeExtensionsClient::RegisterAPISchemaResources(
     ExtensionAPI* api) const {
 #if defined(ENABLE_EXTENSIONS)
   api->RegisterSchemaResource("accessibilityPrivate",
                               IDR_EXTENSION_API_JSON_ACCESSIBILITYPRIVATE);
   api->RegisterSchemaResource("app", IDR_EXTENSION_API_JSON_APP);
   api->RegisterSchemaResource("browserAction",
                               IDR_EXTENSION_API_JSON_BROWSERACTION);
@@ skipping 56 matching lines @@
   return StartsWithASCII(url.spec(), kExtensionBlocklistUrlPrefix, true) ||
          StartsWithASCII(url.spec(), kExtensionBlocklistHttpsUrlPrefix, true);
 }
 
 // static
 ChromeExtensionsClient* ChromeExtensionsClient::GetInstance() {
   return g_client.Pointer();
 }
 
 }  // namespace extensions