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

chrome/common/extensions/chrome_extensions_client.cc

Index: chrome/common/extensions/chrome_extensions_client.cc
diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
index f9ce7e72909cef7ca3592bd19aeaf5d2caa8fa81..e72162cc9f39c8154a44e2a06e1257d923196f10 100644
--- a/chrome/common/extensions/chrome_extensions_client.cc
+++ b/chrome/common/extensions/chrome_extensions_client.cc
@@ -8,6 +8,7 @@
 #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"
@@ -17,6 +18,7 @@
 #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"
@@ -39,12 +41,8 @@
 #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 {
@@ -85,9 +83,7 @@
   // thread runs in-process.
   if (!ManifestHandler::IsRegistrationFinalized()) {
     RegisterCommonManifestHandlers();
-#if defined(ENABLE_EXTENSIONS)
     RegisterChromeManifestHandlers();
-#endif
     ManifestHandler::FinalizeRegistration();
   }
 
@@ -234,26 +230,18 @@
 
 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(