[Sync] Fix backup/rollback tests race conditions

chrome/browser/sync/profile_sync_service_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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 268 matching lines @@
   }
 
   ProfileSyncService* service() {
     return service_.get();
   }
 
   ProfileSyncComponentsFactoryMock* components_factory() {
     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;
   }
 
  protected:
   void PumpLoop() {
     base::RunLoop run_loop;
     base::MessageLoop::current()->PostTask(
         FROM_HERE, run_loop.QuitClosure());
@@ skipping 307 matching lines @@
   // See that we can override the URL with a flag.
   CommandLine command_line(
       base::FilePath(base::FilePath(FILE_PATH_LITERAL("chrome.exe"))));
   command_line.AppendSwitchASCII(switches::kSyncServiceURL, "https://foo/bar");
   EXPECT_EQ("https://foo/bar",
             ProfileSyncService::GetSyncServiceURL(command_line).spec());
 }
 
 }  // namespace
 }  // namespace browser_sync