Move the rest of extension_manifest_constants to top-level extensions/
Move the rest of chrome/common/extensions/extension_manifest_constants to
extensions/common/manifest_constants.
s/extension_manifest_[values|errors]/extensions::manifest_[values|errors]
Remove include of manifest constants in ~20 files that didn't use it.
Fixed small nits when I found (taking out unnecessary extensions::, etc).
[email protected] (c/b/chromeos/)
[email protected] (c/b/themes/)
[email protected] (c/b/ui/cocoa/, c/renderer/)
[email protected] (c/b/ui/panels/)
[email protected] (c/b/ui/views/)
[email protected] (c/b/ui/webui/extensions/)
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/23744004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223318 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index cf612fe9..a84296a 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -72,7 +72,6 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_builder.h"
#include "chrome/common/extensions/extension_l10n_util.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
#include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
#include "chrome/common/extensions/manifest_url_handler.h"
@@ -95,6 +94,7 @@
#include "content/public/test/test_utils.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_resource.h"
+#include "extensions/common/manifest_constants.h"
#include "extensions/common/url_pattern.h"
#include "gpu/config/gpu_info.h"
#include "grit/browser_resources.h"
@@ -1344,22 +1344,22 @@
EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[0]),
std::string("Could not load extension from '*'. ") +
- extension_manifest_errors::kManifestUnreadable)) <<
+ extensions::manifest_errors::kManifestUnreadable)) <<
UTF16ToUTF8(GetErrors()[0]);
EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[1]),
std::string("Could not load extension from '*'. ") +
- extension_manifest_errors::kManifestUnreadable)) <<
+ extensions::manifest_errors::kManifestUnreadable)) <<
UTF16ToUTF8(GetErrors()[1]);
EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[2]),
std::string("Could not load extension from '*'. ") +
- extension_manifest_errors::kMissingFile)) <<
+ extensions::manifest_errors::kMissingFile)) <<
UTF16ToUTF8(GetErrors()[2]);
EXPECT_TRUE(MatchPattern(UTF16ToUTF8(GetErrors()[3]),
std::string("Could not load extension from '*'. ") +
- extension_manifest_errors::kManifestUnreadable)) <<
+ extensions::manifest_errors::kManifestUnreadable)) <<
UTF16ToUTF8(GetErrors()[3]);
};
@@ -5076,19 +5076,21 @@
}
namespace {
- class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
- virtual syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const syncer::SyncChangeList& change_list) OVERRIDE {
- return syncer::SyncError();
- }
- virtual syncer::SyncDataList GetAllSyncData(
- syncer::ModelType type) const OVERRIDE {
- return syncer::SyncDataList();
- }
- };
-}
+class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
+ virtual syncer::SyncError ProcessSyncChanges(
+ const tracked_objects::Location& from_here,
+ const syncer::SyncChangeList& change_list) OVERRIDE {
+ return syncer::SyncError();
+ }
+
+ virtual syncer::SyncDataList GetAllSyncData(
+ syncer::ModelType type) const OVERRIDE {
+ return syncer::SyncDataList();
+ }
+};
+
+} // namespace
TEST_F(ExtensionServiceTest, DeferredSyncStartupPreInstalledComponent) {
InitializeEmptyExtensionService();
