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

chrome/browser/extensions/pending_extension_manager.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_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
 
 #include <list>
 #include <string>
 
 #include "chrome/browser/extensions/pending_extension_info.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 
 class ExtensionServiceInterface;
 class GURL;
 class PendingExtensionManager;
 class Version;
 
 FORWARD_DECLARE_TEST(ExtensionServiceTest,
                      UpdatePendingExtensionAlreadyInstalled);
 
 namespace extensions {
@@ skipping 50 matching lines @@
   bool AddFromSync(
       const std::string& id,
       const GURL& update_url,
       PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
       bool install_silently);
 
   // Given an extension id and an update URL, schedule the extension
   // to be fetched, installed, and activated.
   bool AddFromExternalUpdateUrl(const std::string& id,
                                 const GURL& update_url,
-                                Extension::Location location);
+                                Manifest::Location location);
 
   // Add a pending extension record for an external CRX file.
   // Return true if the CRX should be installed, false if an existing
   // pending record overrides it.
   bool AddFromExternalFile(
       const std::string& id,
-      Extension::Location location,
+      Manifest::Location location,
       const Version& version);
 
   // Get the list of pending IDs that should be installed from an update URL.
   // Pending extensions that will be installed from local files will not be
   // included in the set.
   void GetPendingIdsForUpdateCheck(
       std::list<std::string>* out_ids_for_update_check) const;
 
  private:
   typedef std::list<PendingExtensionInfo> PendingExtensionList;
 
   // Assumes an extension with id |id| is not already installed.
   // Return true if the extension was added.
   bool AddExtensionImpl(
       const std::string& id,
       const GURL& update_url,
       const Version& version,
       PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
       bool is_from_sync,
       bool install_silently,
-      Extension::Location install_source);
+      Manifest::Location install_source);
 
   // Add a pending extension record directly.  Used for unit tests that need
   // to set an inital state. Use friendship to allow the tests to call this
   // method.
   void AddForTesting(const PendingExtensionInfo& pending_extension_info);
 
   // Reference to the extension service whose pending extensions this class is
   // managing.  Because this class is a member of |service_|, it is created
   // and destroyed with |service_|. We only use methods from the interface
   // ExtensionServiceInterface.
   const ExtensionServiceInterface& service_;
 
   PendingExtensionList pending_extension_list_;
 
   FRIEND_TEST_ALL_PREFIXES(::ExtensionServiceTest,
                            UpdatePendingExtensionAlreadyInstalled);
   friend class ExtensionUpdaterTest;
   friend void SetupPendingExtensionManagerForTest(
       int count, const GURL& update_url,
       PendingExtensionManager* pending_extension_manager);
 
   DISALLOW_COPY_AND_ASSIGN(PendingExtensionManager);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_