Reland 87645 with clang fixes.

chrome/browser/sync/glue/model_associator_mock.h

Index: chrome/browser/sync/glue/model_associator_mock.h
diff --git a/chrome/browser/sync/glue/model_associator_mock.h b/chrome/browser/sync/glue/model_associator_mock.h
index 51cb7c4512110f95b599530f8e4c894379e5c041..3474eff91e026d43afd10c2549e8c51e0880bad3 100644
--- a/chrome/browser/sync/glue/model_associator_mock.h
+++ b/chrome/browser/sync/glue/model_associator_mock.h
@@ -6,18 +6,24 @@
 #define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_MOCK_H__
 #pragma once
 
+#include "base/tracked.h"
+#include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace browser_sync {
 
+ACTION_P(SetSyncError, type) {
+  arg0->Reset(FROM_HERE, "test", type);
+}
+
 class ModelAssociatorMock : public AssociatorInterface {
  public:
   ModelAssociatorMock();
   virtual ~ModelAssociatorMock();
 
-  MOCK_METHOD0(AssociateModels, bool());
-  MOCK_METHOD0(DisassociateModels, bool());
+  MOCK_METHOD1(AssociateModels, bool(SyncError* error));
+  MOCK_METHOD1(DisassociateModels, bool(SyncError* error));
   MOCK_METHOD1(SyncModelHasUserCreatedNodes, bool(bool* has_nodes));
   MOCK_METHOD0(AbortAssociation, void());
   MOCK_METHOD0(CryptoReadyIfNecessary, bool());