Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / profile_sync_service_unittest.cc

diff --git a/src/chrome/browser/sync/profile_sync_service_unittest.cc b/src/chrome/browser/sync/profile_sync_service_unittest.cc
index 3a0773b..accbcb4 100644 (file)
--- a/src/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/src/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -57,6 +57,8 @@ class FakeDataTypeManager : public sync_driver::DataTypeManager {
     observer_->OnConfigureDone(result);
   }
 
+  virtual void ReenableType(syncer::ModelType type) OVERRIDE {}
+  virtual void ResetDataTypeErrors() OVERRIDE {}
   virtual void PurgeForMigration(syncer::ModelTypeSet undesired_types,
                                  syncer::ConfigureReason reason) OVERRIDE {}
   virtual void Stop() OVERRIDE {};
@@ -250,7 +252,7 @@ class ProfileSyncServiceTest : public ::testing::Test {
   }
 
   void ExpectDataTypeManagerCreation(int times) {
-    EXPECT_CALL(*components_factory_, CreateDataTypeManager(_, _, _, _, _, _))
+    EXPECT_CALL(*components_factory_, CreateDataTypeManager(_, _, _, _, _))
         .Times(times)
         .WillRepeatedly(ReturnNewDataTypeManager());
   }
@@ -286,7 +288,9 @@ class ProfileSyncServiceTest : public ::testing::Test {
     return components_factory_;
   }
 
-  void ClearBrowsingDataCallback(Profile* profile, base::Time start,
+  void ClearBrowsingDataCallback(BrowsingDataRemover::Observer* observer,
+                                 Profile* profile,
+                                 base::Time start,
                                  base::Time end) {
     EXPECT_EQ(profile_, profile);
     clear_browsing_date_start_ = start;