drive: Fix two instances of madness in FileBrowserEventRouter

chrome/browser/chromeos/extensions/file_browser_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_BROWSER_PRIVATE_API_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 39 matching lines @@
  public:
   explicit FileBrowserPrivateAPI(Profile* profile);
   virtual ~FileBrowserPrivateAPI();
 
   // ProfileKeyedService overrides.
   virtual void Shutdown() OVERRIDE;
 
   // Convenience function to return the FileBrowserPrivateAPI for a Profile.
   static FileBrowserPrivateAPI* Get(Profile* profile);
 
-  scoped_refptr<FileBrowserEventRouter> event_router() {
-    return event_router_;
+  FileBrowserEventRouter* event_router() {
+    return event_router_.get();
   }
 
  private:
-  scoped_refptr<FileBrowserEventRouter> event_router_;
+  scoped_ptr<FileBrowserEventRouter> event_router_;
 };
 
 // Implements the chrome.fileBrowserPrivate.logoutUser method.
 class LogoutUserFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.logoutUser",
                              FILEBROWSERPRIVATE_LOGOUTUSER)
 
  protected:
   virtual ~LogoutUserFunction() {}
@@ skipping 24 matching lines @@
       scoped_refptr<fileapi::FileSystemContext> file_system_context,
       const GURL& source_url,
       int child_id);
 };
 
 // Implements the chrome.fileBrowserPrivate.addFileWatch method.
 class FileWatchBrowserFunctionBase : public AsyncExtensionFunction {
  protected:
   virtual ~FileWatchBrowserFunctionBase() {}
 
-  virtual bool PerformFileWatchOperation(
-      scoped_refptr<FileBrowserEventRouter> event_router,
-      const base::FilePath& local_path, const base::FilePath& virtual_path,
+  virtual void PerformFileWatchOperation(

[hashimoto, 2013/04/08 11:10:26]

nit: Could you add a comment for this method while you are here?

[satorux1, 2013/04/09 01:24:38]

Done.

+      const base::FilePath& local_path,
+      const base::FilePath& virtual_path,
       const std::string& extension_id) = 0;
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
- private:
-  void RespondOnUIThread(bool success);
-  void RunFileWatchOperationOnFileThread(
-      scoped_refptr<FileBrowserEventRouter> event_router,
-      const fileapi::FileSystemURL& file_url,
-      const std::string& extension_id);
+  // Calls SendResponse() with |success| converted to base::Value.
+  void Respond(bool success);
 };
 
 // Implements the chrome.fileBrowserPrivate.addFileWatch method.
 class AddFileWatchBrowserFunction : public FileWatchBrowserFunctionBase {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.addFileWatch",
                              FILEBROWSERPRIVATE_ADDFILEWATCH)
 
  protected:
   virtual ~AddFileWatchBrowserFunction() {}
 
-  virtual bool PerformFileWatchOperation(
-      scoped_refptr<FileBrowserEventRouter> event_router,
-      const base::FilePath& local_path, const base::FilePath& virtual_path,
+  virtual void PerformFileWatchOperation(

[hashimoto, 2013/04/08 11:10:26]

nit: Could you add a "FileWatchBrowserFunctionBase override" comment while you
are here?

[satorux1, 2013/04/09 01:24:38]

Done.

+      const base::FilePath& local_path,
+      const base::FilePath& virtual_path,
       const std::string& extension_id) OVERRIDE;
 };
 
 
 // Implements the chrome.fileBrowserPrivate.removeFileWatch method.
 class RemoveFileWatchBrowserFunction : public FileWatchBrowserFunctionBase {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.removeFileWatch",
                              FILEBROWSERPRIVATE_REMOVEFILEWATCH)
 
  protected:
   virtual ~RemoveFileWatchBrowserFunction() {}
 
-  virtual bool PerformFileWatchOperation(
-      scoped_refptr<FileBrowserEventRouter> event_router,
-      const base::FilePath& local_path, const base::FilePath& virtual_path,
+  virtual void PerformFileWatchOperation(

[hashimoto, 2013/04/08 11:10:26]

ditto.

[satorux1, 2013/04/09 01:24:38]

Done.

+      const base::FilePath& local_path,
+      const base::FilePath& virtual_path,
       const std::string& extension_id) OVERRIDE;
 };
 
 // Implements the chrome.fileBrowserPrivate.getFileTasks method.
 class GetFileTasksFileBrowserFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getFileTasks",
                              FILEBROWSERPRIVATE_GETFILETASKS)
 
  protected:
@@ skipping 717 matching lines @@
   OpenNewWindowFunction();
 
  protected:
   virtual ~OpenNewWindowFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_PRIVATE_API_H_