[Sync] Add support for proxy types

Proxy types are those that have no sync representation, and are used as
placeholder to implicitly enable other types. They are never communicated to
the server, and have no presence in the local sync directory.

BUG=170162,139726
TBR=jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11958029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181534 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 131 insertions, 3 deletions

diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc
index 2739ede..e748829 100644
--- a/chrome/browser/sync/glue/model_association_manager.cc
+++ b/chrome/browser/sync/glue/model_association_manager.cc
@@ -334,7 +334,8 @@ void ModelAssociationManager::TypeStartCallback(
   // occurred.
   if ((DataTypeController::IsSuccessfulResult(start_result) ||
        start_result == DataTypeController::ASSOCIATION_FAILED) &&
-      debug_info_listener_.IsInitialized()) {
+      debug_info_listener_.IsInitialized() &&
+      syncer::ProtocolTypes().Has(local_merge_result.model_type())) {
     syncer::DataTypeAssociationStats stats =
         BuildAssociationStatsFromMergeResults(local_merge_result,
                                               syncer_merge_result);
diff --git a/chrome/browser/sync/glue/proxy_data_type_controller.cc b/chrome/browser/sync/glue/proxy_data_type_controller.cc
new file mode 100644
index 0000000..ffe138c
--- /dev/null
+++ b/chrome/browser/sync/glue/proxy_data_type_controller.cc
@@ -0,0 +1,66 @@
+// Copyright (c) 2013 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 "chrome/browser/sync/glue/proxy_data_type_controller.h"
+
+namespace browser_sync {
+
+ProxyDataTypeController::ProxyDataTypeController(syncer::ModelType type)
+    : state_(NOT_RUNNING),
+      type_(type) {
+  DCHECK(syncer::ProxyTypes().Has(type_));
+}
+
+ProxyDataTypeController::~ProxyDataTypeController() {
+}
+
+void ProxyDataTypeController::LoadModels(
+    const ModelLoadCallback& model_load_callback) {
+  state_ = MODEL_LOADED;
+  model_load_callback.Run(type(), syncer::SyncError());
+}
+
+void ProxyDataTypeController::StartAssociating(
+    const StartCallback& start_callback) {
+  syncer::SyncMergeResult local_merge_result(type_);
+  syncer::SyncMergeResult syncer_merge_result(type_);
+  state_ = RUNNING;
+  start_callback.Run(DataTypeController::OK,
+                     local_merge_result,
+                     syncer_merge_result);
+}
+
+void ProxyDataTypeController::Stop() {
+  state_ = NOT_RUNNING;
+}
+
+syncer::ModelType ProxyDataTypeController::type() const {
+  DCHECK(syncer::ProxyTypes().Has(type_));
+  return type_;
+}
+
+syncer::ModelSafeGroup ProxyDataTypeController::model_safe_group() const {
+  DCHECK(syncer::ProxyTypes().Has(type_));
+  return syncer::GROUP_PASSIVE;
+}
+
+std::string ProxyDataTypeController::name() const {
+  // For logging only.
+  return syncer::ModelTypeToString(type());
+}
+
+DataTypeController::State ProxyDataTypeController::state() const {
+  return state_;
+}
+
+void ProxyDataTypeController::OnSingleDatatypeUnrecoverableError(
+    const tracked_objects::Location& from_here, const std::string& message) {
+  NOTIMPLEMENTED();
+}
+
+void ProxyDataTypeController::OnModelLoaded() {
+  NOTIMPLEMENTED();
+}
+
+}  // namespace browser_sync
diff --git a/chrome/browser/sync/glue/proxy_data_type_controller.h b/chrome/browser/sync/glue/proxy_data_type_controller.h
new file mode 100644
index 0000000..4300f33
--- /dev/null
+++ b/chrome/browser/sync/glue/proxy_data_type_controller.h
@@ -0,0 +1,54 @@
+// Copyright (c) 2013 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.
+
+#ifndef CHROME_BROWSER_SYNC_GLUE_PROXY_DATA_TYPE_CONTROLLER_H__
+#define CHROME_BROWSER_SYNC_GLUE_PROXY_DATA_TYPE_CONTROLLER_H__
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "chrome/browser/sync/glue/data_type_controller.h"
+
+namespace browser_sync {
+
+// Implementation for proxy datatypes. These are datatype that have no
+// representation in sync, and therefore no change processor or syncable
+// service.
+class ProxyDataTypeController : public DataTypeController {
+ public:
+  explicit ProxyDataTypeController(syncer::ModelType type);
+
+  // DataTypeController interface.
+  virtual void LoadModels(
+      const ModelLoadCallback& model_load_callback) OVERRIDE;
+  virtual void StartAssociating(const StartCallback& start_callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual syncer::ModelType type() const OVERRIDE;
+  virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
+  virtual std::string name() const OVERRIDE;
+  virtual State state() const OVERRIDE;
+
+  // DataTypeErrorHandler interface.
+  virtual void OnSingleDatatypeUnrecoverableError(
+      const tracked_objects::Location& from_here,
+      const std::string& message) OVERRIDE;
+
+ protected:
+  // DataTypeController is RefCounted.
+  virtual ~ProxyDataTypeController();
+
+  // DataTypeController interface.
+  virtual void OnModelLoaded() OVERRIDE;
+
+ private:
+  State state_;
+
+  // The actual type for this controller.
+  syncer::ModelType type_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProxyDataTypeController);
+};
+
+}  // namespace browser_sync
+
+#endif  // CHROME_BROWSER_SYNC_GLUE_PROXY_DATA_TYPE_CONTROLLER_H__
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index ba44c87..9ea68f0 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -689,6 +689,7 @@ void SyncBackendHost::ConfigureDataTypes(
       GetDataTypesInState(ENABLED, config_state_map),
       syncer::Union(GetDataTypesInState(DISABLED, config_state_map),
                     GetDataTypesInState(FAILED, config_state_map)));
+  types_to_download.RemoveAll(syncer::ProxyTypes());
   if (!types_to_download.Empty())
     types_to_download.Put(syncer::NIGORI);
 
@@ -1386,7 +1387,8 @@ void SyncBackendHost::Core::DoFinishConfigureDataTypes(
   // Update the enabled types for the bridge and sync manager.
   syncer::ModelSafeRoutingInfo routing_info;
   registrar_->GetModelSafeRoutingInfo(&routing_info);
-  const syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
+  syncer::ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info);
+  enabled_types.RemoveAll(syncer::ProxyTypes());
   sync_manager_->UpdateEnabledTypes(enabled_types);
 
   const syncer::ModelTypeSet failed_configuration_types =
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 9aa75fc..62d1112 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -69,6 +69,10 @@ void SyncPrefs::RegisterUserPrefs(PrefServiceSyncable* prefs) {
 
   syncer::ModelTypeSet user_types = syncer::UserTypes();
 
+  // Include proxy types as well, as they can be individually selected,
+  // although they don't have sync representations.
+  user_types.PutAll(syncer::ProxyTypes());
+
   // Treat bookmarks specially.
   RegisterDataTypePreferredPref(prefs, syncer::BOOKMARKS, true);
   user_types.Remove(syncer::BOOKMARKS);
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index 249754dd..d6e5626 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -77,8 +77,9 @@ class MigrationTest : public SyncTest {
     // ProfileSyncService must already have been created before we can call
     // GetPreferredDataTypes().
     DCHECK(GetClient(0)->IsSyncAlreadySetup());
-    const syncer::ModelTypeSet preferred_data_types =
+    syncer::ModelTypeSet preferred_data_types =
         GetClient(0)->service()->GetPreferredDataTypes();
+    preferred_data_types.RemoveAll(syncer::ProxyTypes());
     // Make sure all clients have the same preferred data types.
     for (int i = 1; i < num_clients(); ++i) {
       const syncer::ModelTypeSet other_preferred_data_types =