Index: sync/internal_api/public/test/null_sync_context_proxy.h |
diff --git a/sync/internal_api/public/test/null_sync_context_proxy.h b/sync/internal_api/public/test/null_sync_context_proxy.h |
index c6546193b385cc5960bb5a1e70cacb910ad820fc..cc4573833a69d8adc4f29ad9f4cc98f844233dcd 100644 |
--- a/sync/internal_api/public/test/null_sync_context_proxy.h |
+++ b/sync/internal_api/public/test/null_sync_context_proxy.h |
@@ -9,11 +9,9 @@ |
#include "sync/internal_api/public/non_blocking_sync_common.h" |
#include "sync/internal_api/public/sync_context_proxy.h" |
-namespace syncer { |
+namespace syncer_v2 { |
class ModelTypeSyncProxyImpl; |
-} |
-namespace syncer_v2 { |
// A non-functional implementation of SyncContextProxy. |
// |
// It supports Clone(), but not much else. Useful for testing. |
@@ -22,11 +20,11 @@ class NullSyncContextProxy : public SyncContextProxy { |
NullSyncContextProxy(); |
~NullSyncContextProxy() override; |
- void ConnectTypeToSync(syncer::ModelType type, |
- const DataTypeState& data_type_state, |
- const UpdateResponseDataList& saved_pending_updates, |
- const base::WeakPtr<syncer::ModelTypeSyncProxyImpl>& |
- type_sync_proxy) override; |
+ void ConnectTypeToSync( |
+ syncer::ModelType type, |
+ const DataTypeState& data_type_state, |
+ const UpdateResponseDataList& saved_pending_updates, |
+ const base::WeakPtr<ModelTypeSyncProxyImpl>& type_sync_proxy) override; |
void Disconnect(syncer::ModelType type) override; |
scoped_ptr<SyncContextProxy> Clone() const override; |
}; |