Moved CrxInstaller and CrxInstallerError into extensions namespace

chrome/browser/extensions/extension_service.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_EXTENSION_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 32 matching lines @@
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/syncable_service.h"
 
 class AppNotificationManager;
 class BookmarkExtensionEventRouter;
-class CrxInstaller;
 class ExtensionBrowserEventRouter;
 class ExtensionFontSettingsEventRouter;
 class ExtensionGlobalError;
 class ExtensionManagedModeEventRouter;
 class ExtensionManagementEventRouter;
 class ExtensionPreferenceEventRouter;
 class ExtensionSyncData;
 class ExtensionSystem;
 class ExtensionToolbarModel;
 class HistoryExtensionEventRouter;
 class GURL;
 class PendingExtensionManager;
 class Profile;
 class Version;
 
 namespace chromeos {
 class ExtensionBluetoothEventRouter;
 class ExtensionInputMethodEventRouter;
 }
 
 namespace syncer {
 class SyncData;
 class SyncErrorFactory;
 }
 
 namespace extensions {
 class AppSyncData;
 class ComponentLoader;
 class ContentSettingsStore;
+class CrxInstaller;
 class Extension;
 class ExtensionCookiesEventRouter;
 class ExtensionSyncData;
 class ExtensionUpdater;
 class SettingsFrontend;
 class WebNavigationEventRouter;
 }
 
 // This is an interface class to encapsulate the dependencies that
 // various classes have on ExtensionService. This allows easy mocking.
 class ExtensionServiceInterface : public syncer::SyncableService {
  public:
   // A function that returns true if the given extension should be
   // included and false if it should be filtered out.  Identical to
   // PendingExtensionInfo::ShouldAllowInstallPredicate.
   typedef bool (*ExtensionFilter)(const extensions::Extension&);
 
   virtual ~ExtensionServiceInterface() {}
   virtual const ExtensionSet* extensions() const = 0;
   virtual const ExtensionSet* disabled_extensions() const = 0;
   virtual PendingExtensionManager* pending_extension_manager() = 0;
 
   // Install an update.  Return true if the install can be started.
   // Set out_crx_installer to the installer if one was started.
   virtual bool UpdateExtension(
       const std::string& id,
       const FilePath& path,
       const GURL& download_url,
-      CrxInstaller** out_crx_installer) = 0;
+      extensions::CrxInstaller** out_crx_installer) = 0;
   virtual const extensions::Extension* GetExtensionById(const std::string& id,
                                             bool include_disabled) const = 0;
   virtual const extensions::Extension* GetInstalledExtension(
       const std::string& id) const = 0;
 
   virtual bool IsExtensionEnabled(const std::string& extension_id) const = 0;
   virtual bool IsExternalExtensionUninstalled(
       const std::string& extension_id) const = 0;
 
   virtual void UpdateExtensionBlacklist(
@@ skipping 185 matching lines @@
       const std::string& id) const OVERRIDE;
 
   // Updates a currently-installed extension with the contents from
   // |extension_path|.
   // TODO(aa): This method can be removed. ExtensionUpdater could use
   // CrxInstaller directly instead.
   virtual bool UpdateExtension(
       const std::string& id,
       const FilePath& extension_path,
       const GURL& download_url,
-      CrxInstaller** out_crx_installer) OVERRIDE;
+      extensions::CrxInstaller** out_crx_installer) OVERRIDE;
 
   // Reloads the specified extension.
   void ReloadExtension(const std::string& extension_id);
 
   // Uninstalls the specified extension. Callers should only call this method
   // with extensions that exist. |external_uninstall| is a magical parameter
   // that is only used to send information to ExtensionPrefs, which external
   // callers should never set to true.
   //
   // We pass the |extension_id| by value to avoid having it deleted from under
@@ skipping 524 matching lines @@
   scoped_ptr<ExtensionGlobalError> extension_global_error_;
 
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsWithUnlimtedStorage);
   FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
                            InstallAppsAndCheckStorageProtection);
   DISALLOW_COPY_AND_ASSIGN(ExtensionService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SERVICE_H_