Moved ExternalExtensionLoaders/Providers into extensions namespace

chrome/browser/policy/app_pack_updater.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_POLICY_APP_PACK_UPDATER_H_
 #define CHROME_BROWSER_POLICY_APP_PACK_UPDATER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/extensions/updater/extension_downloader_delegate.h"
 #include "chrome/browser/policy/cloud_policy_subsystem.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "net/base/network_change_notifier.h"
 
 class CrxInstaller;
-class ExternalExtensionLoader;
 class FilePath;

[Joao da Silva, 2012/07/16 08:08:47]

Nit: "base/file_path.h" is already included

[Devlin, 2012/07/16 15:40:30]

Done.

 class GURL;
 
 namespace extensions {
 class ExtensionDownloader;
+class ExternalLoader;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace tracked_objects {
 class Location;
 }
 
 namespace policy {
 
-class AppPackExternalExtensionLoader;
+class AppPackExternalLoader;
 class BrowserPolicyConnector;
 
 // The AppPackUpdater manages a set of extensions that are configured via a
 // device policy to be locally cached and installed into the Demo user account
 // at login time.
 class AppPackUpdater : public CloudPolicySubsystem::Observer,
                        public content::NotificationObserver,
                        public net::NetworkChangeNotifier::IPAddressObserver,
                        public extensions::ExtensionDownloaderDelegate {
  public:
   // Callback to listen for updates to the screensaver extension's path.
   typedef base::Callback<void(const FilePath&)> ScreenSaverUpdateCallback;
 
   // Keys for the entries in the AppPack dictionary policy.
   static const char kExtensionId[];
   static const char kUpdateUrl[];
 
   // The |request_context| is used for the update checks.
   AppPackUpdater(net::URLRequestContextGetter* request_context,
                  BrowserPolicyConnector* connector);
   virtual ~AppPackUpdater();
 
-  // Creates an ExternalExtensionLoader that will load the crx files downloaded
-  // by the AppPackUpdater. This can be called at most once, and the caller
-  // owns the returned value.
-  ExternalExtensionLoader* CreateExternalExtensionLoader();
+  // Creates an extensions::ExternalLoader that will load the crx files
+  // downloaded by the AppPackUpdater. This can be called at most once, and the
+  // caller owns the returned value.
+  extensions::ExternalLoader* CreateExternalLoader();
 
   // |callback| will be invoked whenever the screen saver extension's path
   // changes. It will be invoked "soon" after this call if a valid path already
   // exists. Subsequent calls will override the previous |callback|. A null
   // |callback| can be used to remove a previous callback.
   void SetScreenSaverUpdateCallback(const ScreenSaverUpdateCallback& callback);
 
  private:
   struct AppPackEntry {
     std::string update_url;
@@ skipping 135 matching lines @@
   std::string screen_saver_id_;
   FilePath screen_saver_path_;
 
   // Callback to invoke whenever the screen saver's extension path changes.
   // Can be null.
   ScreenSaverUpdateCallback screen_saver_update_callback_;
 
   // The extension loader wires the AppPackUpdater to the extensions system, and
   // makes it install the currently cached extensions.
   bool created_extension_loader_;
-  base::WeakPtr<AppPackExternalExtensionLoader> extension_loader_;
+  base::WeakPtr<AppPackExternalLoader> extension_loader_;
 
   // Used to download the extensions configured via policy, and to check for
   // updates.
   scoped_ptr<extensions::ExtensionDownloader> downloader_;
 
   // Request context used by the |downloader_|.
   net::URLRequestContextGetter* request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AppPackUpdater);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_APP_PACK_UPDATER_H_