drive: Stop calling OpenFileSystem from SearchDriveFunction/SearchDriveMetadataFunction

chrome/browser/chromeos/extensions/file_manager/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_MANAGER_FILE_BROWSER_PRIVATE_API_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_
 
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 638 matching lines @@
                              FILEBROWSERPRIVATE_SEARCHDRIVE)
 
   SearchDriveFunction();
 
  protected:
   virtual ~SearchDriveFunction();
 
   virtual bool RunImpl() OVERRIDE;
 
  private:
-  // Callback fo OpenFileSystem called from RunImpl.
-  void OnFileSystemOpened(base::PlatformFileError result,
-                          const std::string& file_system_name,
-                          const GURL& file_system_url);
-  // Callback for google_apis::SearchAsync called after file system is opened.
+  // Callback for Search().
   void OnSearch(drive::FileError error,
                 const GURL& next_feed,
                 scoped_ptr<std::vector<drive::SearchResultInfo> > result_paths);
-
-  // Query for which the search is being performed.
-  std::string query_;
-  std::string next_feed_;
-  // Information about remote file system we will need to create file entries
-  // to represent search results.
-  std::string file_system_name_;
-  GURL file_system_url_;
 };
 
 // Similar to SearchDriveFunction but this one is used for searching drive
 // metadata which is stored locally.
 class SearchDriveMetadataFunction : public FileBrowserFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.searchDriveMetadata",
                              FILEBROWSERPRIVATE_SEARCHDRIVEMETADATA)
 
   SearchDriveMetadataFunction();
 
  protected:
   virtual ~SearchDriveMetadataFunction();
 
   virtual bool RunImpl() OVERRIDE;
 
  private:
-  // Callback fo OpenFileSystem called from RunImpl.
-  void OnFileSystemOpened(base::PlatformFileError result,
-                          const std::string& file_system_name,
-                          const GURL& file_system_url);
-  // Callback for LocalSearch().
-  void OnSearchMetadata(
-      drive::FileError error,
-      scoped_ptr<drive::MetadataSearchResultVector> results);
-
-  // Query for which the search is being performed.
-  std::string query_;
-  // String representing what type of entries are needed. It corresponds to
-  // SearchMetadataOptions:
-  // SEARCH_METADATA_OPTION_EXCLUDE_DIRECTORIES => "EXCLUDE_DIRECTORIES"
-  // SEARCH_METADATA_OPTION_ALL => "ALL"
-  std::string types_;
-  // Maximum number of results. The results contains |max_num_results_| entries
-  // at most.
-  int max_results_;
-
-  // Information about remote file system we will need to create file entries
-  // to represent search results.
-  std::string file_system_name_;
-  GURL file_system_url_;
+  // Callback for SearchMetadata();
+  void OnSearchMetadata(drive::FileError error,
+                        scoped_ptr<drive::MetadataSearchResultVector> results);
 };
 
 class ClearDriveCacheFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.clearDriveCache",
                              FILEBROWSERPRIVATE_CLEARDRIVECACHE)
 
  protected:
   virtual ~ClearDriveCacheFunction() {}
 
@@ skipping 87 matching lines @@
   OpenNewWindowFunction();
 
  protected:
   virtual ~OpenNewWindowFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_