drive: Drop "Drive" from FakeDriveFileSystem and MockDriveFileSystem

chrome/browser/chromeos/drive/drive_file_stream_reader.cc

 // Copyright 2013 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/drive/drive_file_stream_reader.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/callback_helpers.h"
@@ skipping 187 matching lines @@
 }
 
 }  // namespace internal
 
 namespace {
 
 // Calls DriveFileSystemInterface::GetFileContentByPath if the file system
 // is available. If not, the |completion_callback| is invoked with
 // FILE_ERROR_FAILED.
 void GetFileContentByPathOnUIThread(
-    const DriveFileStreamReader::DriveFileSystemGetter& file_system_getter,
+    const DriveFileStreamReader::FileSystemGetter& file_system_getter,
     const base::FilePath& drive_file_path,
     const GetFileContentInitializedCallback& initialized_callback,
     const google_apis::GetContentCallback& get_content_callback,
     const FileOperationCallback& completion_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DriveFileSystemInterface* file_system = file_system_getter.Run();
   if (!file_system) {
     completion_callback.Run(FILE_ERROR_FAILED);
     return;
   }
 
   file_system->GetFileContentByPath(drive_file_path,
                                     initialized_callback,
                                     get_content_callback,
                                     completion_callback);
 }
 
 // Helper to run DriveFileSystemInterface::GetFileContentByPath on UI thread.
 void GetFileContentByPath(
-    const DriveFileStreamReader::DriveFileSystemGetter& file_system_getter,
+    const DriveFileStreamReader::FileSystemGetter& file_system_getter,
     const base::FilePath& drive_file_path,
     const GetFileContentInitializedCallback& initialized_callback,
     const google_apis::GetContentCallback& get_content_callback,
     const FileOperationCallback& completion_callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&GetFileContentByPathOnUIThread,
                  file_system_getter,
                  drive_file_path,
                  google_apis::CreateRelayCallback(initialized_callback),
                  google_apis::CreateRelayCallback(get_content_callback),
                  google_apis::CreateRelayCallback(completion_callback)));
 }
 
 }  // namespace
 
 DriveFileStreamReader::DriveFileStreamReader(
-    const DriveFileSystemGetter& drive_file_system_getter)
-    : drive_file_system_getter_(drive_file_system_getter),
+    const FileSystemGetter& file_system_getter)
+    : file_system_getter_(file_system_getter),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 DriveFileStreamReader::~DriveFileStreamReader() {
 }
 
 bool DriveFileStreamReader::IsInitialized() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return reader_proxy_.get() != NULL;
 }
 
 void DriveFileStreamReader::Initialize(
     const base::FilePath& drive_file_path,
     const InitializeCompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!callback.is_null());
 
   GetFileContentByPath(
-      drive_file_system_getter_,
+      file_system_getter_,
       drive_file_path,
       base::Bind(&DriveFileStreamReader
                      ::InitializeAfterGetFileContentByPathInitialized,
                  weak_ptr_factory_.GetWeakPtr(),
                  drive_file_path,
                  callback),
       base::Bind(&DriveFileStreamReader::OnGetContent,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&DriveFileStreamReader::OnGetFileContentByPathCompletion,
                  weak_ptr_factory_.GetWeakPtr(),
@@ skipping 101 matching lines @@
     // Note: due to the same reason, LocalReaderProxy::OnCompleted may
     // or may not be called. This is timing issue, and it is difficult to avoid
     // unfortunately.
     if (error != FILE_ERROR_OK) {
       callback.Run(error, scoped_ptr<DriveEntryProto>());
     }
   }
 }
 
 }  // namespace drive