Get rid of FileManagerPrivateAPI class

The whole purpose of FileManagerPrivateAPI class was to hold an
EventRouter instance. It's simpler to just make EventRouter a
KeyedService and get rid of FileManagerPrivateAPI.

Note that BrowserContextKeyedAPI could not be used for EventRouter as
EventRouter needs a Profile rather than a BrowserContext.

In the next patch, EventRouter will be renamed to something like
FileManagerService.

BUG=412643
TEST=Files.app works as before

Review URL: https://codereview.chromium.org/553393002

Cr-Commit-Position: refs/heads/master@{#294351}

chrome/browser/chromeos/extensions/file_manager/event_router.cc

@@ -388,6 +388,7 @@ EventRouter::EventRouter(Profile* profile)
       device_event_router_(new DeviceEventRouterImpl(profile)),
       weak_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  ObserveEvents();
 }
 
 EventRouter::~EventRouter() {

chrome/browser/chromeos/extensions/file_manager/event_router.h

@@ -24,6 +24,7 @@
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/network/network_state_handler_observer.h"
+#include "components/keyed_service/core/keyed_service.h"
 #include "storage/browser/fileapi/file_system_operation.h"
 
 class PrefChangeRegistrar;
@@ -48,7 +49,8 @@ class DeviceEventRouter;
 
 // Monitors changes in disk mounts, network connection state and preferences
 // affecting File Manager. Dispatches appropriate File Browser events.
-class EventRouter : public chromeos::NetworkStateHandlerObserver,
+class EventRouter : public KeyedService,
+                    public chromeos::NetworkStateHandlerObserver,
                     public drive::FileSystemObserver,
                     public drive::JobListObserver,
                     public drive::DriveServiceObserver,
@@ -58,10 +60,8 @@ class EventRouter : public chromeos::NetworkStateHandlerObserver,
   explicit EventRouter(Profile* profile);
   virtual ~EventRouter();
 
-  void Shutdown();
-
-  // Starts observing file system change events.
-  void ObserveEvents();
+  // KeyedService overrides.
+  virtual void Shutdown() OVERRIDE;
 
   typedef base::Callback<void(bool success)> BoolCallback;
 
@@ -135,6 +135,9 @@ class EventRouter : public chromeos::NetworkStateHandlerObserver,
  private:
   typedef std::map<base::FilePath, FileWatcher*> WatcherMap;
 
+  // Starts observing file system change events.
+  void ObserveEvents();
+
   // Called when prefs related to file manager change.
   void OnFileManagerPrefsChanged();
 

chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.cc → chrome/browser/chromeos/extensions/file_manager/event_router_factory.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h"
+#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
 
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h"
+#include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ -16,21 +16,19 @@
 namespace file_manager {
 
 // static
-FileManagerPrivateAPI*
-FileManagerPrivateAPIFactory::GetForProfile(Profile* profile) {
-  return static_cast<FileManagerPrivateAPI*>(
+EventRouter* EventRouterFactory::GetForProfile(Profile* profile) {
+  return static_cast<EventRouter*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
-FileManagerPrivateAPIFactory*
-FileManagerPrivateAPIFactory::GetInstance() {
-  return Singleton<FileManagerPrivateAPIFactory>::get();
+EventRouterFactory* EventRouterFactory::GetInstance() {
+  return Singleton<EventRouterFactory>::get();
 }
 
-FileManagerPrivateAPIFactory::FileManagerPrivateAPIFactory()
+EventRouterFactory::EventRouterFactory()
     : BrowserContextKeyedServiceFactory(
-          "FileManagerPrivateAPI",
+          "EventRouter",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());
   DependsOn(
@@ -38,25 +36,25 @@ FileManagerPrivateAPIFactory::FileManagerPrivateAPIFactory()
   DependsOn(VolumeManagerFactory::GetInstance());
 }
 
-FileManagerPrivateAPIFactory::~FileManagerPrivateAPIFactory() {
+EventRouterFactory::~EventRouterFactory() {
 }
 
-KeyedService* FileManagerPrivateAPIFactory::BuildServiceInstanceFor(
+KeyedService* EventRouterFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new FileManagerPrivateAPI(Profile::FromBrowserContext(context));
+  return new EventRouter(Profile::FromBrowserContext(context));
 }
 
-content::BrowserContext* FileManagerPrivateAPIFactory::GetBrowserContextToUse(
+content::BrowserContext* EventRouterFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Explicitly and always allow this router in guest login mode.
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
-bool FileManagerPrivateAPIFactory::ServiceIsCreatedWithBrowserContext() const {
+bool EventRouterFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
-bool FileManagerPrivateAPIFactory::ServiceIsNULLWhileTesting() const {
+bool EventRouterFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 

chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h → chrome/browser/chromeos/extensions/file_manager/event_router_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FACTORY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -12,16 +12,16 @@ class Profile;
 
 namespace file_manager {
 
-class FileManagerPrivateAPI;
+class EventRouter;
 
-class FileManagerPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
+class EventRouterFactory : public BrowserContextKeyedServiceFactory {
  public:
-  // Returns the FileManagerPrivateAPI for |profile|, creating it if
+  // Returns the EventRouter for |profile|, creating it if
   // it is not yet created.
-  static FileManagerPrivateAPI* GetForProfile(Profile* profile);
+  static EventRouter* GetForProfile(Profile* profile);
 
-  // Returns the FileManagerPrivateAPIFactory instance.
-  static FileManagerPrivateAPIFactory* GetInstance();
+  // Returns the EventRouterFactory instance.
+  static EventRouterFactory* GetInstance();
 
  protected:
   // BrowserContextKeyedBaseFactory overrides:
@@ -31,10 +31,10 @@ class FileManagerPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
 
  private:
-  friend struct DefaultSingletonTraits<FileManagerPrivateAPIFactory>;
+  friend struct DefaultSingletonTraits<EventRouterFactory>;
 
-  FileManagerPrivateAPIFactory();
-  virtual ~FileManagerPrivateAPIFactory();
+  EventRouterFactory();
+  virtual ~EventRouterFactory();
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
@@ -43,4 +43,4 @@ class FileManagerPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace file_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FACTORY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_FACTORY_H_

chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.cc

-// 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.
-
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h"
-
-#include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h"
-
-namespace file_manager {
-
-FileManagerPrivateAPI::FileManagerPrivateAPI(Profile* profile)
-    : event_router_(new EventRouter(profile)) {
-  event_router_->ObserveEvents();
-}
-
-FileManagerPrivateAPI::~FileManagerPrivateAPI() {
-}
-
-void FileManagerPrivateAPI::Shutdown() {
-  event_router_->Shutdown();
-}
-
-// static
-FileManagerPrivateAPI* FileManagerPrivateAPI::Get(Profile* profile) {
-  return FileManagerPrivateAPIFactory::GetForProfile(profile);
-}
-
-}  // namespace file_manager

chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.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_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "components/keyed_service/core/keyed_service.h"
-
-class Profile;
-
-namespace file_manager {
-
-class EventRouter;
-
-// Manages and registers the fileManagerPrivate API with the extension system.
-class FileManagerPrivateAPI : public KeyedService {
- public:
-  explicit FileManagerPrivateAPI(Profile* profile);
-  virtual ~FileManagerPrivateAPI();
-
-  // KeyedService overrides.
-  virtual void Shutdown() OVERRIDE;
-
-  // Convenience function to return the FileManagerPrivateAPI for a Profile.
-  static FileManagerPrivateAPI* Get(Profile* profile);
-
-  EventRouter* event_router() { return event_router_.get(); }
-
- private:
-  scoped_ptr<EventRouter> event_router_;
-};
-
-}  // namespace file_manager
-
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_H_

chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc

@@ -16,7 +16,7 @@
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h"
+#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
@@ -83,7 +83,7 @@ file_manager::EventRouter* GetEventRouterByProfileId(void* profile_id) {
   if (!g_browser_process->profile_manager()->IsValidProfile(profile))
     return NULL;
 
-  return file_manager::FileManagerPrivateAPI::Get(profile)->event_router();
+  return file_manager::EventRouterFactory::GetForProfile(profile);
 }
 
 // Notifies the copy progress to extensions via event router.
@@ -381,7 +381,7 @@ void FileManagerPrivateAddFileWatchFunction::PerformFileWatchOperation(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   file_manager::EventRouter* event_router =
-      file_manager::FileManagerPrivateAPI::Get(GetProfile())->event_router();
+      file_manager::EventRouterFactory::GetForProfile(GetProfile());
   event_router->AddFileWatch(
       local_path,
       virtual_path,
@@ -396,7 +396,7 @@ void FileManagerPrivateRemoveFileWatchFunction::PerformFileWatchOperation(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   file_manager::EventRouter* event_router =
-      file_manager::FileManagerPrivateAPI::Get(GetProfile())->event_router();
+      file_manager::EventRouterFactory::GetForProfile(GetProfile());
   event_router->RemoveFileWatch(local_path, extension_id);
   Respond(true);
 }

chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc

@@ -11,7 +11,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/app_installer.h"
 #include "chrome/browser/chromeos/file_manager/zip_file_creator.h"

chrome/browser/extensions/browser_context_keyed_service_factories.cc

@@ -66,7 +66,7 @@
 #include "extensions/browser/api/usb/usb_device_resource.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h"
+#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
 #include "chrome/browser/chromeos/extensions/input_method_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
@@ -157,7 +157,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
   extensions::WebstoreAPI::GetFactoryInstance();
 #if defined(OS_CHROMEOS)
-  file_manager::FileManagerPrivateAPIFactory::GetInstance();
+  file_manager::EventRouterFactory::GetInstance();
 #endif
   TokenCacheServiceFactory::GetInstance();
   extensions::ExtensionGCMAppHandler::GetFactoryInstance();

chrome/chrome_browser_chromeos.gypi

@@ -1048,12 +1048,10 @@
             'browser/chromeos/extensions/file_manager/device_event_router.h',
             'browser/chromeos/extensions/file_manager/event_router.cc',
             'browser/chromeos/extensions/file_manager/event_router.h',
+            'browser/chromeos/extensions/file_manager/event_router_factory.cc',
+            'browser/chromeos/extensions/file_manager/event_router_factory.h',
             'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc',
             'browser/chromeos/extensions/file_manager/file_browser_handler_api.h',
-            'browser/chromeos/extensions/file_manager/file_manager_private_api.cc',
-            'browser/chromeos/extensions/file_manager/file_manager_private_api.h',
-            'browser/chromeos/extensions/file_manager/file_manager_private_api_factory.cc',
-            'browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h',
             'browser/chromeos/extensions/file_manager/file_manager_private_api_functions.h',
             'browser/chromeos/extensions/file_manager/private_api_base.cc',
             'browser/chromeos/extensions/file_manager/private_api_base.h',