This CL broke the official builders.

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

> Move ManifestHandler to top-level extensions.
> 
> BUG=298586
> R=benwells@chromium.org
> 
> Review URL: https://codereview.chromium.org/52593012

TBR=yoz@chromium.org

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

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

50 files changed, 54 insertions, 58 deletions

diff --git a/chrome/browser/extensions/api/identity/experimental_identity_api.cc b/chrome/browser/extensions/api/identity/experimental_identity_api.cc
index 86534310..bb6d1c2 100644
--- a/chrome/browser/extensions/api/identity/experimental_identity_api.cc
+++ b/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"
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index a3932ad..7ee1591 100644
--- a/chrome/chrome_common.gypi
+++ b/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',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 733ed26..6b5f43f 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/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',
diff --git a/chrome/common/extensions/api/commands/commands_handler.h b/chrome/common/extensions/api/commands/commands_handler.h
index f4eb609..54f2b7e 100644
--- a/chrome/common/extensions/api/commands/commands_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/extension_action/browser_action_handler.h b/chrome/common/extensions/api/extension_action/browser_action_handler.h
index 2a5ce42..9ab4a77 100644
--- a/chrome/common/extensions/api/extension_action/browser_action_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.h b/chrome/common/extensions/api/extension_action/page_action_handler.h
index fadf243..b623f6e 100644
--- a/chrome/common/extensions/api/extension_action/page_action_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/extension_action/script_badge_handler.h b/chrome/common/extensions/api/extension_action/script_badge_handler.h
index 1969dd3..cd742bc0 100644
--- a/chrome/common/extensions/api/extension_action/script_badge_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h
index da69a6e..16b36f2 100644
--- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h
+++ b/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"
 
diff --git a/chrome/common/extensions/api/file_handlers/file_handlers_parser.h b/chrome/common/extensions/api/file_handlers/file_handlers_parser.h
index 0e3da7b..3e6589d 100644
--- a/chrome/common/extensions/api/file_handlers/file_handlers_parser.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/i18n/default_locale_handler.h b/chrome/common/extensions/api/i18n/default_locale_handler.h
index cf73b80..1ba0dab 100644
--- a/chrome/common/extensions/api/i18n/default_locale_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/identity/oauth2_manifest_handler.h b/chrome/common/extensions/api/identity/oauth2_manifest_handler.h
index fd276db..dc3d051 100644
--- a/chrome/common/extensions/api/identity/oauth2_manifest_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/input_ime/input_components_handler.h b/chrome/common/extensions/api/input_ime/input_components_handler.h
index 71d194c..977e56b 100644
--- a/chrome/common/extensions/api/input_ime/input_components_handler.h
+++ b/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 {
diff --git a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h b/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h
index 740016a..5e825da 100644
--- a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h b/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h
index d8a2545..6bdf28e 100644
--- a/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h
+++ b/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;
 
diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.h b/chrome/common/extensions/api/omnibox/omnibox_handler.h
index 50fd24d..5ef709e 100644
--- a/chrome/common/extensions/api/omnibox/omnibox_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/plugins/plugins_handler.h b/chrome/common/extensions/api/plugins/plugins_handler.h
index 2315412..827aa40 100644
--- a/chrome/common/extensions/api/plugins/plugins_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/sockets/sockets_handler.h b/chrome/common/extensions/api/sockets/sockets_handler.h
index 2859407..ff280d1 100644
--- a/chrome/common/extensions/api/sockets/sockets_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h b/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h
index 42d8fee..13b194b 100644
--- a/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/spellcheck/spellcheck_handler.h b/chrome/common/extensions/api/spellcheck/spellcheck_handler.h
index 3e37d92..1c484fcb 100644
--- a/chrome/common/extensions/api/spellcheck/spellcheck_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/storage/storage_schema_manifest_handler.h b/chrome/common/extensions/api/storage/storage_schema_manifest_handler.h
index 15bf822..a387d52 100644
--- a/chrome/common/extensions/api/storage/storage_schema_manifest_handler.h
+++ b/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;
diff --git a/chrome/common/extensions/api/system_indicator/system_indicator_handler.h b/chrome/common/extensions/api/system_indicator/system_indicator_handler.h
index 65d3719..7267f82 100644
--- a/chrome/common/extensions/api/system_indicator/system_indicator_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/api/url_handlers/url_handlers_parser.h b/chrome/common/extensions/api/url_handlers/url_handlers_parser.h
index a2eb8f9..4b2ed4d 100644
--- a/chrome/common/extensions/api/url_handlers/url_handlers_parser.h
+++ b/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;
diff --git a/chrome/common/extensions/background_info.h b/chrome/common/extensions/background_info.h
index cb334d6..b375b8b 100644
--- a/chrome/common/extensions/background_info.h
+++ b/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 {
diff --git a/chrome/common/extensions/csp_handler.h b/chrome/common/extensions/csp_handler.h
index 19f37e9..210b82c 100644
--- a/chrome/common/extensions/csp_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index e118bdc..86f20ff 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -21,6 +21,7 @@
 #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"
@@ -28,7 +29,6 @@
 #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"
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 7c2a94e..ab90faf 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/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"
diff --git a/chrome/common/extensions/incognito_handler.h b/chrome/common/extensions/incognito_handler.h
index 1f59cca7..b9eadee 100644
--- a/chrome/common/extensions/incognito_handler.h
+++ b/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 {
 
diff --git a/extensions/common/manifest_handler.cc b/chrome/common/extensions/manifest_handler.cc
index 43e6bd8..fbd2201 100644
--- a/extensions/common/manifest_handler.cc
+++ b/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>
 
diff --git a/extensions/common/manifest_handler.h b/chrome/common/extensions/manifest_handler.h
index fd7b571..42f989bc 100644
--- a/extensions/common/manifest_handler.h
+++ b/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_
diff --git a/extensions/common/manifest_handler_unittest.cc b/chrome/common/extensions/manifest_handler_unittest.cc
index f5e012e..74b8698 100644
--- a/extensions/common/manifest_handler_unittest.cc
+++ b/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 {
diff --git a/chrome/common/extensions/manifest_handlers/app_isolation_info.h b/chrome/common/extensions/manifest_handlers/app_isolation_info.h
index f43929f..e2f14f7 100644
--- a/chrome/common/extensions/manifest_handlers/app_isolation_info.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/app_launch_info.h b/chrome/common/extensions/manifest_handlers/app_launch_info.h
index ba3a10b..e1a31e6 100644
--- a/chrome/common/extensions/manifest_handlers/app_launch_info.h
+++ b/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 {
diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.h b/chrome/common/extensions/manifest_handlers/content_scripts_handler.h
index 389c7ee..0258147 100644
--- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.h
+++ b/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 {
diff --git a/chrome/common/extensions/manifest_handlers/externally_connectable.h b/chrome/common/extensions/manifest_handlers/externally_connectable.h
index ede81b8..328216e 100644
--- a/chrome/common/extensions/manifest_handlers/externally_connectable.h
+++ b/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;
diff --git a/chrome/common/extensions/manifest_handlers/icons_handler.h b/chrome/common/extensions/manifest_handlers/icons_handler.h
index 147e7cf..d5a7751 100644
--- a/chrome/common/extensions/manifest_handlers/icons_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h b/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h
index 71144b7..05a553a 100644
--- a/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.h b/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.h
index 557c101..92535f2 100644
--- a/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h
index 743eed2..fed2ce9 100644
--- a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/offline_enabled_info.h b/chrome/common/extensions/manifest_handlers/offline_enabled_info.h
index ae2199fa..a429a8c 100644
--- a/chrome/common/extensions/manifest_handlers/offline_enabled_info.h
+++ b/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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/requirements_handler.h b/chrome/common/extensions/manifest_handlers/requirements_handler.h
index e9b2c9e..f99c1ac 100644
--- a/chrome/common/extensions/manifest_handlers/requirements_handler.h
+++ b/chrome/common/extensions/manifest_handlers/requirements_handler.h
@@ -9,8 +9,8 @@
 
 #include "base/memory/scoped_ptr.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 {
 
diff --git a/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h b/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h
index eb3c5dc..a0695da 100644
--- a/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h
+++ b/chrome/common/extensions/manifest_handlers/sandboxed_page_info.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/url_pattern_set.h"
 
 namespace extensions {
diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
index ace8c58..cf0bed4d 100644
--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h
@@ -7,7 +7,7 @@
 
 #include "chrome/common/extensions/api/manifest_types.h"
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace extensions {
 
diff --git a/chrome/common/extensions/manifest_handlers/shared_module_info.h b/chrome/common/extensions/manifest_handlers/shared_module_info.h
index ef9d869..f76725a 100644
--- a/chrome/common/extensions/manifest_handlers/shared_module_info.h
+++ b/chrome/common/extensions/manifest_handlers/shared_module_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"
 
 namespace extensions {
 
diff --git a/chrome/common/extensions/manifest_handlers/theme_handler.h b/chrome/common/extensions/manifest_handlers/theme_handler.h
index 64f650e..1a710a9 100644
--- a/chrome/common/extensions/manifest_handlers/theme_handler.h
+++ b/chrome/common/extensions/manifest_handlers/theme_handler.h
@@ -6,7 +6,7 @@
 #define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_THEME_HANDLER_H_
 
 #include "chrome/common/extensions/extension.h"
-#include "extensions/common/manifest_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/chrome/common/extensions/manifest_url_handler.h b/chrome/common/extensions/manifest_url_handler.h
index d11146b..500dce1 100644
--- a/chrome/common/extensions/manifest_url_handler.h
+++ b/chrome/common/extensions/manifest_url_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 {
 
diff --git a/chrome/common/extensions/mime_types_handler.h b/chrome/common/extensions/mime_types_handler.h
index 75acc5b..03256de 100644
--- a/chrome/common/extensions/mime_types_handler.h
+++ b/chrome/common/extensions/mime_types_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"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "url/gurl.h"
diff --git a/chrome/common/extensions/web_accessible_resources_handler.h b/chrome/common/extensions/web_accessible_resources_handler.h
index 61db433..4a12089 100644
--- a/chrome/common/extensions/web_accessible_resources_handler.h
+++ b/chrome/common/extensions/web_accessible_resources_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 {
 
diff --git a/chrome/common/extensions/webview_handler.h b/chrome/common/extensions/webview_handler.h
index 64c7db3..0bd2918 100644
--- a/chrome/common/extensions/webview_handler.h
+++ b/chrome/common/extensions/webview_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 {
 
diff --git a/extensions/DEPS b/extensions/DEPS
index 29ebf1e..14eae2f 100644
--- a/extensions/DEPS
+++ b/extensions/DEPS
@@ -7,15 +7,11 @@ include_rules = [
 
 # More specific rules for what we are allowed to include.
 specific_include_rules = {
-  ".*test\.cc$": [
+  ".*test\.cc": [
     "+content/public/test",
   ],
-  # Temporary includes for tests.
-  "^api_permission_set_unittest\.cc$": [
+  "api_permission_set_unittest\.cc": [
+    # Temporary include for tests.
     "+chrome/common/extensions/extension_messages.h",
   ],
-  "^manifest_handler_unittest\.cc$": [
-    "+chrome/common/extensions/extension_builder.h",
-    "+chrome/common/extensions/value_builder.h",
-  ],
 }
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index a29d9c5..f58a442 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -59,8 +59,6 @@
         'common/manifest.h',
         'common/manifest_constants.cc',
         'common/manifest_constants.h',
-        'common/manifest_handler.cc',
-        'common/manifest_handler.h',
         'common/matcher/regex_set_matcher.cc',
         'common/matcher/regex_set_matcher.h',
         'common/matcher/string_pattern.cc',