Remove legacy in DriveSyncClient.

chrome/browser/chromeos/drive/drive_sync_client_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 "chrome/browser/chromeos/drive/drive_sync_client.h"
 
 #include <algorithm>

[hashimoto, 2013/04/19 03:43:22]

Is this include needed?

[kinaba, 2013/04/19 03:51:44]

Done.

 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"

[hashimoto, 2013/04/19 03:43:22]

ditto.

[kinaba, 2013/04/19 03:51:44]

Done.

 #include "base/prefs/pref_service.h"

[hashimoto, 2013/04/19 03:43:22]

ditto.

[kinaba, 2013/04/19 03:51:44]

Done.

 #include "base/test/test_timeouts.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_test_util.h"
 #include "chrome/browser/chromeos/drive/mock_drive_file_system.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/common/chrome_paths.h"

[hashimoto, 2013/04/19 03:43:22]

ditto.

[kinaba, 2013/04/19 03:51:44]

Done.

 #include "chrome/common/pref_names.h"

[hashimoto, 2013/04/19 03:43:22]

ditto.

[kinaba, 2013/04/19 03:51:44]

Done.

-#include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using ::testing::AnyNumber;
-using ::testing::DoAll;
-using ::testing::Return;
 using ::testing::StrictMock;
 using ::testing::_;
 
 namespace drive {
 
 namespace {
 
 // Action used to set mock expectations for GetFileByResourceId().
 ACTION_P4(MockGetFileByResourceId, error, local_path, mime_type, file_type) {
   arg2.Run(error, local_path, mime_type, file_type);
 }
 
 // Action used to set mock expectations for UpdateFileByResourceId().
 ACTION_P(MockUpdateFileByResourceId, error) {
   arg2.Run(error);
 }
 
 // Action used to set mock expectations for GetFileInfoByResourceId().
 ACTION_P2(MockUpdateFileByResourceId, error, md5) {
   scoped_ptr<DriveEntryProto> entry_proto(new DriveEntryProto);
   entry_proto->mutable_file_specific_info()->set_file_md5(md5);
   arg1.Run(error, base::FilePath(), entry_proto.Pass());
 }
 
-class MockNetworkChangeNotifier : public net::NetworkChangeNotifier {
- public:
-  MOCK_CONST_METHOD0(GetCurrentConnectionType,
-                     net::NetworkChangeNotifier::ConnectionType());
-};
-
 }  // namespace
 
 class DriveSyncClientTest : public testing::Test {
  public:
   DriveSyncClientTest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        profile_(new TestingProfile),
         mock_file_system_(new StrictMock<MockDriveFileSystem>) {
   }
 
   virtual void SetUp() OVERRIDE {
-    mock_network_change_notifier_.reset(new MockNetworkChangeNotifier);
-
     // Create a temporary directory.
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     // Initialize the cache.
     scoped_refptr<base::SequencedWorkerPool> pool =
         content::BrowserThread::GetBlockingPool();
     cache_.reset(new DriveCache(
         temp_dir_.path(),
         pool->GetSequencedTaskRunner(pool->GetSequenceToken()),
         NULL /* free_disk_space_getter */));
     bool success = false;
     cache_->RequestInitialize(
         google_apis::test_util::CreateCopyResultCallback(&success));
     google_apis::test_util::RunBlockingPoolTask();
     ASSERT_TRUE(success);
     SetUpCache();
 
     // Initialize the sync client.
-    sync_client_.reset(new DriveSyncClient(profile_.get(),
-                                           mock_file_system_.get(),
+    sync_client_.reset(new DriveSyncClient(mock_file_system_.get(),
                                            cache_.get()));
 
     EXPECT_CALL(*mock_file_system_, AddObserver(sync_client_.get())).Times(1);
     EXPECT_CALL(*mock_file_system_,
                 RemoveObserver(sync_client_.get())).Times(1);
 
     // Disable delaying so that DoSyncLoop() starts immediately.
     sync_client_->set_delay_for_testing(base::TimeDelta::FromSeconds(0));
     sync_client_->Initialize();
   }
 
   virtual void TearDown() OVERRIDE {
     // The sync client should be deleted before NetworkLibrary, as the sync
     // client registers itself as observer of NetworkLibrary.
     sync_client_.reset();
     cache_.reset();
-    mock_network_change_notifier_.reset();
   }
 
   // Sets up cache for tests.
   void SetUpCache() {
     // Prepare a temp file.
     base::FilePath temp_file;
     EXPECT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(),
                                                     &temp_file));
     const std::string content = "hello";
     EXPECT_EQ(static_cast<int>(content.size()),
@@ skipping 112 matching lines @@
   // Adds a resource ID of a file to upload.
   void AddResourceIdToUpload(const std::string& resource_id) {
     sync_client_->AddResourceIdForTesting(DriveSyncClient::UPLOAD,
                                           resource_id);
   }
 
  protected:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   base::ScopedTempDir temp_dir_;
-  scoped_ptr<TestingProfile> profile_;
   scoped_ptr<StrictMock<MockDriveFileSystem> > mock_file_system_;
   scoped_ptr<DriveCache, test_util::DestroyHelperForTests> cache_;
   scoped_ptr<DriveSyncClient> sync_client_;
-  scoped_ptr<MockNetworkChangeNotifier> mock_network_change_notifier_;
 };
 
 TEST_F(DriveSyncClientTest, StartInitialScan) {
   // Start processing the files in the backlog. This will collect the
   // resource IDs of these files.
   sync_client_->StartProcessingBacklog();
 
   // Check the contents of the queue for fetching.
   SetExpectationForGetFileByResourceId("resource_id_not_fetched_bar");
   SetExpectationForGetFileByResourceId("resource_id_not_fetched_baz");
@@ skipping 59 matching lines @@
   // Start checking the existing pinned files. This will collect the resource
   // IDs of pinned files, with stale local cache files.
   sync_client_->StartCheckingExistingPinnedFiles();
 
   SetExpectationForGetFileByResourceId("resource_id_fetched");
 
   google_apis::test_util::RunBlockingPoolTask();
 }
 
 }  // namespace drive