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

chrome/browser/sync/test/integration/sync_extension_helper.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_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 
 class Profile;
 class SyncTest;
 
 namespace extensions {
 class Extension;
 }
 
 class SyncExtensionHelper {
  public:
   // Singleton implementation.
   static SyncExtensionHelper* GetInstance();
 
   // Returns a generated extension ID for the given name.
   static std::string NameToId(const std::string& name);
 
   // Initializes the profiles in |test| and registers them with
   // internal data structures.
   void SetupIfNecessary(SyncTest* test);
 
   // Installs the extension with the given name to |profile|, and returns the
   // extension ID of the new extension.
   std::string InstallExtension(Profile* profile,
                                const std::string& name,
-                               extensions::Extension::Type type);
+                               extensions::Manifest::Type type);
 
   // Uninstalls the extension with the given name from |profile|.
   void UninstallExtension(Profile* profile, const std::string& name);
 
   // Returns a vector containing the names of all currently installed extensions
   // on |profile|.
   std::vector<std::string> GetInstalledExtensionNames(Profile* profile) const;
 
   // Enables the extension with the given name on |profile|.
   void EnableExtension(Profile* profile, const std::string& name);
@@ skipping 36 matching lines @@
 
     EnabledState enabled_state;
     bool incognito_enabled;
   };
 
   typedef std::map<std::string, ExtensionState> ExtensionStateMap;
   typedef std::map<std::string, scoped_refptr<extensions::Extension> >
       ExtensionNameMap;
   typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap;
   typedef std::map<std::string, std::string> StringMap;
-  typedef std::map<std::string, extensions::Extension::Type> TypeMap;
+  typedef std::map<std::string, extensions::Manifest::Type> TypeMap;
 
   friend struct DefaultSingletonTraits<SyncExtensionHelper>;
 
   SyncExtensionHelper();
   ~SyncExtensionHelper();
 
   // Returns a map from |profile|'s installed extensions to their state.
   static ExtensionStateMap GetExtensionStates(Profile* profile);
 
   // Initializes extensions for |profile| and creates an entry in
   // |profile_extensions_| for it.
   void SetupProfile(Profile* profile);
 
   // Returns an extension for the given name in |profile|.  type and
   // index.  Two extensions with the name but different profiles will
   // have the same id.
   scoped_refptr<extensions::Extension> GetExtension(
       Profile* profile, const std::string& name,
-      extensions::Extension::Type type) WARN_UNUSED_RESULT;
+      extensions::Manifest::Type type) WARN_UNUSED_RESULT;
 
   ProfileExtensionNameMap profile_extensions_;
   StringMap id_to_name_;
   TypeMap id_to_type_;
   bool setup_completed_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncExtensionHelper);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_EXTENSION_HELPER_H_