[Sync] Tidy up SyncBackendHost interface.

chrome/browser/sync/glue/sync_backend_host_mock.h

Index: chrome/browser/sync/glue/sync_backend_host_mock.h
diff --git a/chrome/browser/sync/glue/sync_backend_host_mock.h b/chrome/browser/sync/glue/sync_backend_host_mock.h
index e133a5794a23e7f4851f28ea420063c090814cfd..16f25949c331732f05025cf5a46ecc7090b3d139 100644
--- a/chrome/browser/sync/glue/sync_backend_host_mock.h
+++ b/chrome/browser/sync/glue/sync_backend_host_mock.h
@@ -16,18 +16,14 @@
 
 namespace browser_sync {
 
-ACTION(InvokeTask) {
-  arg1->Run();
-  delete arg1;
-}
-
 class SyncBackendHostMock : public SyncBackendHost {
  public:
   SyncBackendHostMock();
   virtual ~SyncBackendHostMock();
 
-  MOCK_METHOD2(ConfigureDataTypes,
-               void(const std::set<syncable::ModelType>&, CancelableTask*));
+  MOCK_METHOD3(ConfigureDataTypes,
+               void(const DataTypeController::TypeMap&,
+                    const std::set<syncable::ModelType>&, CancelableTask*));
   MOCK_METHOD0(RequestPause, bool());
   MOCK_METHOD0(RequestResume, bool());
   MOCK_METHOD0(StartSyncingWithServer, void());