Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

chrome/common/extensions/manifest_tests/extension_manifest_test.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
 #define CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
 
 #include "base/values.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/manifest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 class ExtensionManifestTest : public testing::Test {
  public:
   ExtensionManifestTest();
 
  protected:
@@ skipping 27 matching lines @@
 
    private:
     const std::string name_;
     mutable DictionaryValue* manifest_;
     mutable scoped_ptr<DictionaryValue> manifest_holder_;
   };
 
   scoped_refptr<extensions::Extension> LoadExtension(
       const Manifest& manifest,
       std::string* error,
-      extensions::Extension::Location location =
-          extensions::Extension::INTERNAL,
+      extensions::Manifest::Location location =
+          extensions::Manifest::INTERNAL,
       int flags = extensions::Extension::NO_FLAGS);
 
   scoped_refptr<extensions::Extension> LoadAndExpectSuccess(
       const Manifest& manifest,
-      extensions::Extension::Location location =
-          extensions::Extension::INTERNAL,
+      extensions::Manifest::Location location =
+          extensions::Manifest::INTERNAL,
       int flags = extensions::Extension::NO_FLAGS);
 
   scoped_refptr<extensions::Extension> LoadAndExpectSuccess(
       char const* manifest_name,
-      extensions::Extension::Location location =
-          extensions::Extension::INTERNAL,
+      extensions::Manifest::Location location =
+          extensions::Manifest::INTERNAL,
       int flags = extensions::Extension::NO_FLAGS);
 
   scoped_refptr<extensions::Extension> LoadAndExpectWarning(
       const Manifest& manifest,
       const std::string& expected_error,
-      extensions::Extension::Location location =
-          extensions::Extension::INTERNAL,
+      extensions::Manifest::Location location =
+          extensions::Manifest::INTERNAL,
       int flags = extensions::Extension::NO_FLAGS);
 
   scoped_refptr<extensions::Extension> LoadAndExpectWarning(
       char const* manifest_name,
       const std::string& expected_error,
-      extensions::Extension::Location location =
-          extensions::Extension::INTERNAL,
+      extensions::Manifest::Location location =
+          extensions::Manifest::INTERNAL,
       int flags = extensions::Extension::NO_FLAGS);
 
   void VerifyExpectedError(extensions::Extension* extension,
                            const std::string& name,
                            const std::string& error,
                            const std::string& expected_error);
 
   void LoadAndExpectError(char const* manifest_name,
                           const std::string& expected_error,
-                          extensions::Extension::Location location =
-                              extensions::Extension::INTERNAL,
+                          extensions::Manifest::Location location =
+                              extensions::Manifest::INTERNAL,
                           int flags = extensions::Extension::NO_FLAGS);
 
   void LoadAndExpectError(const Manifest& manifest,
                           const std::string& expected_error,
-                          extensions::Extension::Location location =
-                              extensions::Extension::INTERNAL,
+                          extensions::Manifest::Location location =
+                              extensions::Manifest::INTERNAL,
                           int flags = extensions::Extension::NO_FLAGS);
 
   void AddPattern(extensions::URLPatternSet* extent,
                   const std::string& pattern);
 
   // used to differentiate between calls to LoadAndExpectError,
   // LoadAndExpectWarning and LoadAndExpectSuccess via function RunTestcases.
   enum EXPECT_TYPE {
     EXPECT_TYPE_ERROR,
     EXPECT_TYPE_WARNING,
     EXPECT_TYPE_SUCCESS
   };
 
   struct Testcase {
     std::string manifest_filename_;
     std::string expected_error_; // only used for ExpectedError tests
-    extensions::Extension::Location location_;
+    extensions::Manifest::Location location_;
     int flags_;
 
     Testcase(std::string manifest_filename, std::string expected_error,
-        extensions::Extension::Location location, int flags);
+        extensions::Manifest::Location location, int flags);
 
     Testcase(std::string manifest_filename, std::string expected_error);
 
     explicit Testcase(std::string manifest_filename);
 
     Testcase(std::string manifest_filename,
-             extensions::Extension::Location location,
+             extensions::Manifest::Location location,
              int flags);
   };
 
   void RunTestcases(const Testcase* testcases, size_t num_testcases,
       EXPECT_TYPE type);
 
   bool enable_apps_;
 
   // Force the manifest tests to run as though they are on trunk, since several
   // tests rely on manifest features being available that aren't on
   // stable/beta.
   //
   // These objects nest, so if a test wants to explicitly test the behaviour
   // on stable or beta, declare it inside that test.
   extensions::Feature::ScopedCurrentChannel current_channel_;
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_