gdata: Stop getting GDataUploader via GDataSystemService

chrome/browser/chromeos/gdata/gdata_file_system_unittest.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 <errno.h>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 141 matching lines @@
 }
 
 }  // anonymous namespace
 
 class MockFreeDiskSpaceGetter : public FreeDiskSpaceGetterInterface {
  public:
   virtual ~MockFreeDiskSpaceGetter() {}
   MOCK_CONST_METHOD0(AmountOfFreeDiskSpace, int64());
 };
 
+class MockGDataUploader : public GDataUploaderInterface {
+ public:
+  virtual ~MockGDataUploader() {}
+  // This function is not mockable by gmock.
+  virtual int UploadFile(
+      scoped_ptr<UploadFileInfo> upload_file_info) OVERRIDE {
+    return -1;
+  }
+
+  MOCK_METHOD2(UpdateUpload, void(int upload_id,
+                                  content::DownloadItem* download));
+  MOCK_CONST_METHOD1(GetUploadedBytes, int64(int upload_id));
+};
+
 class GDataFileSystemTest : public testing::Test {
  protected:
   GDataFileSystemTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         io_thread_(content::BrowserThread::IO),
         sequence_token_(
             content::BrowserThread::GetBlockingPool()->GetSequenceToken()),
+        cache_(NULL),
         file_system_(NULL),
         mock_doc_service_(NULL),
         num_callback_invocations_(0),
         expected_error_(base::PLATFORM_FILE_OK),
         expected_cache_state_(0),
         expected_sub_dir_type_(GDataCache::CACHE_TYPE_META),
         expect_outgoing_symlink_(false),
         root_feed_changestamp_(0) {
   }
 
@@ skipping 13 matching lines @@
 
     // Likewise, this will be owned by GDataFileSystem.
     mock_free_disk_space_checker_ = new MockFreeDiskSpaceGetter;
     SetFreeDiskSpaceGetterForTesting(mock_free_disk_space_checker_);
 
     cache_ = GDataCache::CreateGDataCacheOnUIThread(
         GDataCache::GetCacheRootPath(profile_.get()),
         content::BrowserThread::GetBlockingPool(),
         sequence_token_);
 
+    mock_uploader_.reset(new StrictMock<MockGDataUploader>);
+
     ASSERT_FALSE(file_system_);
     file_system_ = new GDataFileSystem(profile_.get(),
                                        cache_,
                                        mock_doc_service_,
+                                       mock_uploader_.get(),
                                        sequence_token_);
 
     mock_sync_client_.reset(new StrictMock<MockGDataSyncClient>);
     cache_->AddObserver(mock_sync_client_.get());
 
     mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>);
     file_system_->AddObserver(mock_directory_observer_.get());
 
     file_system_->Initialize();
     cache_->RequestInitializeOnUIThread();
@@ skipping 1046 matching lines @@
 
   MessageLoopForUI message_loop_;
   // The order of the test threads is important, do not change the order.
   // See also content/browser/browser_thread_imple.cc.
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   const base::SequencedWorkerPool::SequenceToken sequence_token_;
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<CallbackHelper> callback_helper_;
   GDataCache* cache_;
+  scoped_ptr<StrictMock<MockGDataUploader> > mock_uploader_;
   GDataFileSystem* file_system_;
   MockDocumentsService* mock_doc_service_;
   MockFreeDiskSpaceGetter* mock_free_disk_space_checker_;
   scoped_ptr<StrictMock<MockGDataSyncClient> > mock_sync_client_;
   scoped_ptr<StrictMock<MockDirectoryChangeObserver> > mock_directory_observer_;
 
   int num_callback_invocations_;
   base::PlatformFileError expected_error_;
   int expected_cache_state_;
   GDataCache::CacheSubDirectoryType expected_sub_dir_type_;
@@ skipping 2209 matching lines @@
 
   // Try to close the same file twice.
   file_system_->CloseFile(kFileInRoot, close_file_callback);
   message_loop_.Run();
 
   // It must fail.
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND, callback_helper_->last_error_);
 }
 
 }   // namespace gdata