Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

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>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 133 matching lines @@
   }
 
   // Sets up MockNetworkChangeNotifier as if it's connected to a network with
   // the specified connection type.
   void ChangeConnectionType(net::NetworkChangeNotifier::ConnectionType type) {
     EXPECT_CALL(*mock_network_change_notifier_, GetCurrentConnectionType())
         .WillRepeatedly(Return(type));
     // Notify the sync client that the network is changed. This is done via
     // NetworkChangeNotifier in production, but here, we simulate the behavior
     // by directly calling OnConnectionTypeChanged().
-    sync_client_->OnConnectionTypeChanged(type);
+    sync_client_->OnNetworkChanged(type);
   }
 
   // Sets up MockNetworkChangeNotifier as if it's connected to wifi network.
   void ConnectToWifi() {
     ChangeConnectionType(net::NetworkChangeNotifier::CONNECTION_WIFI);
   }
 
   // Sets up MockNetworkChangeNotifier as if it's connected to cellular network.
   void ConnectToCellular() {
     ChangeConnectionType(net::NetworkChangeNotifier::CONNECTION_2G);
@@ skipping 212 matching lines @@
   AddResourceIdToFetch("resource_id_not_fetched_baz");
   AddResourceIdToUpload("resource_id_dirty");
 
   // These files will be fetched or uploaded by DriveFileSystem, once
   // StartSyncLoop() starts.
   SetExpectationForGetFileByResourceId("resource_id_not_fetched_foo");
   SetExpectationForGetFileByResourceId("resource_id_not_fetched_bar");
   SetExpectationForGetFileByResourceId("resource_id_not_fetched_baz");
   SetExpectationForUpdateFileByResourceId("resource_id_dirty");
 
-  sync_client_->StartSyncLoop();
+  sync_client_->StartSyncLoop(false);
 }
 
 TEST_F(DriveSyncClientTest, StartSyncLoop_Offline) {
   ConnectToNone();
 
   AddResourceIdToFetch("resource_id_not_fetched_foo");
   AddResourceIdToFetch("resource_id_not_fetched_bar");
   AddResourceIdToFetch("resource_id_not_fetched_baz");
   AddResourceIdToUpload("resource_id_dirty");
 
   // These files will be neither fetched nor uploaded not by DriveFileSystem,
   // as network is not connected.
 
-  sync_client_->StartSyncLoop();
+  sync_client_->StartSyncLoop(false);
 }
 
 TEST_F(DriveSyncClientTest, StartSyncLoop_ResumedConnection) {
   const std::string resource_id("resource_id_not_fetched_foo");
   const FilePath file_path(
       FilePath::FromUTF8Unsafe("local_path_does_not_matter"));
   const std::string mime_type("mime_type_does_not_matter");
   ConnectToWifi();
   AddResourceIdToFetch(resource_id);
 
   // Disconnect from network on fetch try.
   SetDisconnectingExpectationForGetFileByResourceId(resource_id);
 
-  sync_client_->StartSyncLoop();
+  sync_client_->StartSyncLoop(false);
 
   // Expect fetch retry on network reconnection.
   EXPECT_CALL(*mock_file_system_, GetFileByResourceId(resource_id, _, _))
       .WillOnce(MockGetFileByResourceId(
           DRIVE_FILE_OK, file_path, mime_type, REGULAR_FILE));
 
   ConnectToWifi();
 }
 
 TEST_F(DriveSyncClientTest, StartSyncLoop_CelluarDisabled) {
@@ skipping 77 matching lines @@
   profile_->GetPrefs()->SetBoolean(prefs::kDisableDrive, true);
 
   AddResourceIdToFetch("resource_id_not_fetched_foo");
   AddResourceIdToFetch("resource_id_not_fetched_bar");
   AddResourceIdToFetch("resource_id_not_fetched_baz");
   AddResourceIdToUpload("resource_id_dirty");
 
   // These files will be neither fetched nor uploaded not by DriveFileSystem,
   // as the Drive feature is disabled.
 
-  sync_client_->StartSyncLoop();
+  sync_client_->StartSyncLoop(false);
 }
 
 TEST_F(DriveSyncClientTest, OnCachePinned) {
   ConnectToWifi();
 
   // This file will be fetched by GetFileByResourceId() as OnCachePinned()
   // will kick off the sync loop.
   SetExpectationForGetFileByResourceId("resource_id_not_fetched_foo");
 
   sync_client_->OnCachePinned("resource_id_not_fetched_foo", "md5");
@@ skipping 151 matching lines @@
   SetExpectationForGetFileByResourceId("resource_id_foo");
 
   ConnectToWifi();
   EXPECT_EQ(TestObserver::IDLE, observer_.state());
 
   // Disconnection during the sync loop should be notified.
   AddResourceIdToFetch("resource_id_bar");
   AddResourceIdToFetch("resource_id_buz");
   SetDisconnectingExpectationForGetFileByResourceId("resource_id_bar");
 
-  sync_client_->StartSyncLoop();
+  sync_client_->StartSyncLoop(false);
   EXPECT_EQ(TestObserver::STOPPED, observer_.state());
 
   // So as the resume from the disconnection.
   SetExpectationForGetFileByResourceId("resource_id_bar");
   SetExpectationForGetFileByResourceId("resource_id_buz");
   ConnectToWifi();
   EXPECT_EQ(TestObserver::IDLE, observer_.state());
 }
 
 }  // namespace drive