drive: Drop "Drive" from FakeDriveFileSystem and MockDriveFileSystem

chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
-#include "chrome/browser/chromeos/drive/fake_drive_file_system.h"
+#include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/google_apis/fake_drive_service.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
@@ skipping 290 matching lines @@
   void SetUpOnUIThread() {
     // Initialize FakeDriveService.
     fake_drive_service_.reset(new google_apis::FakeDriveService);
     fake_drive_service_->LoadResourceListForWapi(
         "chromeos/gdata/root_feed.json");
     fake_drive_service_->LoadAccountMetadataForWapi(
         "chromeos/gdata/account_metadata.json");
     fake_drive_service_->LoadAppListForDriveApi("chromeos/drive/applist.json");
 
     // Create a testee instance.
-    fake_drive_file_system_.reset(
-        new test_util::FakeDriveFileSystem(fake_drive_service_.get()));
-    fake_drive_file_system_->Initialize();
+    fake_file_system_.reset(
+        new test_util::FakeFileSystem(fake_drive_service_.get()));
+    fake_file_system_->Initialize();
   }
 
   void TearDownOnUIThread() {
-    fake_drive_file_system_.reset();
+    fake_file_system_.reset();
     fake_drive_service_.reset();
   }
 
-  DriveFileSystemInterface* GetDriveFileSystem() {
-    return fake_drive_file_system_.get();
+  DriveFileSystemInterface* GetFileSystem() {
+    return fake_file_system_.get();
   }
 
-  DriveFileStreamReader::DriveFileSystemGetter GetDriveFileSystemGetter() {
-    return base::Bind(&DriveFileStreamReaderTest::GetDriveFileSystem,
+  DriveFileStreamReader::FileSystemGetter GetFileSystemGetter() {
+    return base::Bind(&DriveFileStreamReaderTest::GetFileSystem,
                       base::Unretained(this));
   }
 
   MessageLoopForIO message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
 
   scoped_ptr<google_apis::FakeDriveService> fake_drive_service_;
-  scoped_ptr<test_util::FakeDriveFileSystem> fake_drive_file_system_;
+  scoped_ptr<test_util::FakeFileSystem> fake_file_system_;
 };
 
 TEST_F(DriveFileStreamReaderTest, Read) {
   const base::FilePath kDriveFile =
       util::GetDriveMyDriveRootPath().AppendASCII("File 1.txt");
   net::TestCompletionCallback callback;
   const int kBufferSize = 3;
   scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(kBufferSize));
 
   // Create the reader, and initialize it.
   // In this case, the file is not yet locally cached.
   scoped_ptr<DriveFileStreamReader> reader(
-      new DriveFileStreamReader(GetDriveFileSystemGetter()));
+      new DriveFileStreamReader(GetFileSystemGetter()));
 
   EXPECT_FALSE(reader->IsInitialized());
 
   FileError error = FILE_ERROR_FAILED;
   scoped_ptr<DriveEntryProto> entry;
   reader->Initialize(
       kDriveFile,
       google_apis::CreateComposedCallback(
           base::Bind(&google_apis::test_util::RunAndQuit),
                      google_apis::test_util::CreateCopyResultCallback(
@@ skipping 11 matching lines @@
     result = callback.GetResult(result);
     ASSERT_GT(result, 0);
     first_content.append(buffer->data(), result);
   }
 
   EXPECT_EQ(content_size, first_content.size());
 
   // Create second instance and initialize it.
   // In this case, the file should be cached one.
   reader.reset(
-      new DriveFileStreamReader(GetDriveFileSystemGetter()));
+      new DriveFileStreamReader(GetFileSystemGetter()));
   EXPECT_FALSE(reader->IsInitialized());
 
   error = FILE_ERROR_FAILED;
   entry.reset();
   reader->Initialize(
       kDriveFile,
       google_apis::CreateComposedCallback(
           base::Bind(&google_apis::test_util::RunAndQuit),
                      google_apis::test_util::CreateCopyResultCallback(
                          &error, &entry)));
@@ skipping 13 matching lines @@
     result = callback.GetResult(result);
     ASSERT_GT(result, 0);
     second_content.append(buffer->data(), result);
   }
 
   // The same content is expected.
   EXPECT_EQ(first_content, second_content);
 }
 
 }  // namespace drive