This CL broke the official builders.

Revert 232499 "Move ManifestHandler to top-level extensions."

> Move ManifestHandler to top-level extensions.
> 
> BUG=298586
> [email protected]
> 
> Review URL: https://codereview.chromium.org/52593012

[email protected]

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232631 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/identity/experimental_identity_api.cc

@@ -23,9 +23,9 @@
 #include "chrome/common/extensions/api/identity.h"
 #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/page_transition_types.h"
-#include "extensions/common/manifest_handler.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "ui/base/window_open_disposition.h"
 #include "url/gurl.h"

chrome/chrome_common.gypi

@@ -205,6 +205,8 @@
         'common/extensions/features/simple_feature.h',
         'common/extensions/incognito_handler.cc',
         'common/extensions/incognito_handler.h',
+        'common/extensions/manifest_handler.cc',
+        'common/extensions/manifest_handler.h',
         'common/extensions/manifest_handler_helpers.cc',
         'common/extensions/manifest_handler_helpers.h',
         'common/extensions/manifest_handlers/app_isolation_info.cc',

chrome/chrome_tests_unit.gypi

@@ -520,7 +520,6 @@
         '../extensions/common/event_filter_unittest.cc',
         '../extensions/common/extension_resource_unittest.cc',
         '../extensions/common/id_util_unittest.cc',
-        '../extensions/common/manifest_handler_unittest.cc',
         '../extensions/common/matcher/regex_set_matcher_unittest.cc',
         '../extensions/common/matcher/string_pattern_unittest.cc',
         '../extensions/common/matcher/substring_set_matcher_unittest.cc',
@@ -1822,6 +1821,7 @@
         'common/extensions/manifest_tests/extension_manifests_web_accessible_resources_unittest.cc',
         'common/extensions/manifest_tests/extension_manifests_web_unittest.cc',
         'common/extensions/manifest_unittest.cc',
+        'common/extensions/manifest_handler_unittest.cc',
         'common/extensions/message_bundle_unittest.cc',
         'common/extensions/permissions/media_galleries_permission_unittest.cc',
         'common/extensions/permissions/permission_set_unittest.cc',

chrome/common/extensions/api/commands/commands_handler.h

@@ -10,8 +10,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/extension_action/browser_action_handler.h

@@ -9,7 +9,7 @@
 
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/extension_action/page_action_handler.h

@@ -9,7 +9,7 @@
 
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/extension_action/script_badge_handler.h

@@ -9,7 +9,7 @@
 
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h

@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 

chrome/common/extensions/api/file_handlers/file_handlers_parser.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/i18n/default_locale_handler.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/identity/oauth2_manifest_handler.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/input_ime/input_components_handler.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "url/gurl.h"
 
 namespace extensions {

chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h

@@ -10,9 +10,9 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h

@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 class URLPattern;
 

chrome/common/extensions/api/omnibox/omnibox_handler.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/plugins/plugins_handler.h

@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/sockets/sockets_handler.h

@@ -7,8 +7,8 @@
 
 #include "base/strings/string16.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/permissions/socket_permission_data.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/speech/tts_engine_manifest_handler.h

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/spellcheck/spellcheck_handler.h

@@ -6,7 +6,7 @@
 #define CHROME_COMMON_EXTENSIONS_API_SPELLCHECK_SPELLCHECK_HANDLER_H_
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/storage/storage_schema_manifest_handler.h

@@ -6,7 +6,7 @@
 #define CHROME_COMMON_EXTENSIONS_API_STORAGE_STORAGE_SCHEMA_MANIFEST_HANDLER_H_
 
 #include "base/basictypes.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace policy {
 class SchemaOwner;

chrome/common/extensions/api/system_indicator/system_indicator_handler.h

@@ -7,7 +7,7 @@
 
 #include "base/strings/string16.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/api/url_handlers/url_handlers_parser.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/url_pattern.h"
 
 class GURL;

chrome/common/extensions/background_info.h

@@ -10,7 +10,7 @@
 
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "url/gurl.h"
 
 namespace extensions {

chrome/common/extensions/csp_handler.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/extension.cc

@@ -21,14 +21,14 @@
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/permissions/permissions_data.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/id_util.h"
 #include "extensions/common/manifest.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_set.h"
 #include "extensions/common/permissions/permissions_info.h"

chrome/common/extensions/extension_file_util.cc

@@ -24,6 +24,7 @@
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_messages.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 #include "chrome/common/extensions/manifest_handlers/theme_handler.h"
 #include "chrome/common/extensions/message_bundle.h"
@@ -32,7 +33,6 @@
 #include "extensions/common/install_warning.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
-#include "extensions/common/manifest_handler.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"

chrome/common/extensions/incognito_handler.h

@@ -7,7 +7,7 @@
 
 #include "base/strings/string16.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

extensions/common/manifest_handler.cc → chrome/common/extensions/manifest_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 #include <map>
 

extensions/common/manifest_handler.h → chrome/common/extensions/manifest_handler.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef EXTENSIONS_COMMON_MANIFEST_HANDLER_H_
-#define EXTENSIONS_COMMON_MANIFEST_HANDLER_H_
+#ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLER_H_
+#define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLER_H_
 
 #include <set>
 #include <string>
@@ -135,4 +135,4 @@ class ManifestHandlerRegistry {
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_COMMON_MANIFEST_HANDLER_H_
+#endif  // CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLER_H_

extensions/common/manifest_handler_unittest.cc → chrome/common/extensions/manifest_handler_unittest.cc

@@ -11,9 +11,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_builder.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/value_builder.h"
 #include "extensions/common/install_warning.h"
-#include "extensions/common/manifest_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {

chrome/common/extensions/manifest_handlers/app_isolation_info.h

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/manifest_handlers/app_launch_info.h

@@ -10,8 +10,8 @@
 
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 #include "url/gurl.h"
 
 namespace extensions {

chrome/common/extensions/manifest_handlers/content_scripts_handler.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/user_script.h"
 
 namespace extensions {

chrome/common/extensions/manifest_handlers/externally_connectable.h

@@ -10,8 +10,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/install_warning.h"
-#include "extensions/common/manifest_handler.h"
 #include "extensions/common/url_pattern_set.h"
 
 class GURL;

chrome/common/extensions/manifest_handlers/icons_handler.h

@@ -9,8 +9,8 @@
 
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/extension_resource.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/manifest_handlers/kiosk_mode_info.h

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.h

@@ -5,7 +5,7 @@
 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_MINIMUM_CHROME_VERSION_CHECKER_H_
 #define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_MINIMUM_CHROME_VERSION_CHECKER_H_
 
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/manifest_handlers/nacl_modules_handler.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 

chrome/common/extensions/manifest_handlers/offline_enabled_info.h

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {