Moved ExtensionMessage* into extensions namespace

chrome/browser/extensions/extension_system.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_SYSTEM_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/api_resource_manager.h"
 #include "chrome/browser/extensions/api/serial/serial_connection.h"
 #include "chrome/browser/extensions/api/socket/socket.h"
 #include "chrome/browser/extensions/api/usb/usb_device_resource.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/common/extensions/extension_constants.h"
 
 class ExtensionDevToolsManager;
 class ExtensionInfoMap;
-class ExtensionMessageService;
 class ExtensionNavigationObserver;
 class ExtensionProcessManager;
 class ExtensionService;
 class Profile;
 
 namespace extensions {
 // Unfortunately, for the ApiResourceManager<> template classes, we don't seem
 // to be able to forward-declare because of compilation errors on Windows.
 class AlarmManager;
 class EventRouter;
 class Extension;
 class ExtensionPrefs;
 class ExtensionSystemSharedFactory;
 class LazyBackgroundTaskQueue;
 class ManagementPolicy;
+class MessageService;
 class RulesRegistryService;
 class StateStore;
 class UserScriptMaster;
 
 // The ExtensionSystem manages the creation and destruction of services
 // related to extensions. Most objects are shared between normal
 // and incognito Profiles, except as called out in comments.
 // This interface supports using TestExtensionSystem for TestingProfiles
 // that don't want all of the extensions baggage in their tests.
 class ExtensionSystem : public ProfileKeyedService {
@@ skipping 35 matching lines @@
 
   // The StateStore is created at startup.
   virtual StateStore* state_store() = 0;
 
   // Returns the IO-thread-accessible extension data.
   virtual ExtensionInfoMap* info_map() = 0;
 
   // The LazyBackgroundTaskQueue is created at startup.
   virtual LazyBackgroundTaskQueue* lazy_background_task_queue() = 0;
 
-  // The ExtensionMessageService is created at startup.
-  virtual ExtensionMessageService* message_service() = 0;
+  // The MessageService is created at startup.
+  virtual MessageService* message_service() = 0;
 
   // The EventRouter is created at startup.
   virtual EventRouter* event_router() = 0;
 
   // The RulesRegistryService is created at startup.
   virtual RulesRegistryService* rules_registry_service() = 0;
 
   // The SerialConnection ResourceManager is created at startup.
   virtual ApiResourceManager<SerialConnection>*
   serial_connection_manager() = 0;
@@ skipping 40 matching lines @@
   virtual ExtensionService* extension_service() OVERRIDE;  // shared
   virtual ManagementPolicy* management_policy() OVERRIDE;  // shared
   virtual UserScriptMaster* user_script_master() OVERRIDE;  // shared
   virtual ExtensionDevToolsManager* devtools_manager() OVERRIDE;
   virtual ExtensionProcessManager* process_manager() OVERRIDE;
   virtual AlarmManager* alarm_manager() OVERRIDE;
   virtual StateStore* state_store() OVERRIDE;
   virtual LazyBackgroundTaskQueue* lazy_background_task_queue()
       OVERRIDE;  // shared
   virtual ExtensionInfoMap* info_map() OVERRIDE;  // shared
-  virtual ExtensionMessageService* message_service() OVERRIDE;  // shared
+  virtual MessageService* message_service() OVERRIDE;  // shared
   virtual EventRouter* event_router() OVERRIDE;  // shared
   virtual RulesRegistryService* rules_registry_service()
       OVERRIDE;  // shared
   virtual ApiResourceManager<SerialConnection>* serial_connection_manager()
       OVERRIDE;
   virtual ApiResourceManager<Socket>* socket_manager() OVERRIDE;
   virtual ApiResourceManager<UsbDeviceResource>* usb_device_resource_manager()
       OVERRIDE;
 
   virtual void RegisterExtensionWithRequestContexts(
@@ skipping 19 matching lines @@
     void RegisterManagementPolicyProviders();
     void InitInfoMap();
     void Init(bool extensions_enabled);
 
     StateStore* state_store();
     ExtensionService* extension_service();
     ManagementPolicy* management_policy();
     UserScriptMaster* user_script_master();
     ExtensionInfoMap* info_map();
     LazyBackgroundTaskQueue* lazy_background_task_queue();
-    ExtensionMessageService* message_service();
+    MessageService* message_service();
     EventRouter* event_router();
     RulesRegistryService* rules_registry_service();
 
    private:
     Profile* profile_;
 
     // The services that are shared between normal and incognito profiles.
 
     scoped_ptr<StateStore> state_store_;
     scoped_ptr<ExtensionPrefs> extension_prefs_;
     // ExtensionService depends on the 2 above.
     scoped_ptr<ExtensionService> extension_service_;
     scoped_ptr<ManagementPolicy> management_policy_;
     scoped_refptr<UserScriptMaster> user_script_master_;
     // extension_info_map_ needs to outlive extension_process_manager_.
     scoped_refptr<ExtensionInfoMap> extension_info_map_;
-    // This is a dependency of ExtensionMessageService and EventRouter.
+    // This is a dependency of MessageService and EventRouter.
     scoped_ptr<LazyBackgroundTaskQueue> lazy_background_task_queue_;
-    scoped_ptr<ExtensionMessageService> extension_message_service_;
+    scoped_ptr<MessageService> message_service_;
     scoped_ptr<EventRouter> extension_event_router_;
     scoped_ptr<ExtensionNavigationObserver> extension_navigation_observer_;
     scoped_ptr<RulesRegistryService> rules_registry_service_;
   };
 
   Profile* profile_;
 
   Shared* shared_;
 
   // The services that have their own instances in incognito.
   scoped_refptr<ExtensionDevToolsManager> extension_devtools_manager_;
   // |extension_process_manager_| must be destroyed before the Profile's
   // |io_data_|. While |extension_process_manager_| still lives, we handle
   // incoming resource requests from extension processes and those require
   // access to the ResourceContext owned by |io_data_|.
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
   scoped_ptr<AlarmManager> alarm_manager_;
   scoped_ptr<ApiResourceManager<SerialConnection> > serial_connection_manager_;
   scoped_ptr<ApiResourceManager<Socket> > socket_manager_;
   scoped_ptr<ApiResourceManager<
                UsbDeviceResource> > usb_device_resource_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_