Added DataTypeController integration and UI surfacing for syncing Search Engines.

chrome/browser/sync/glue/search_engine_data_type_controller.cc

Index: chrome/browser/sync/glue/search_engine_data_type_controller.cc
===================================================================
--- chrome/browser/sync/glue/search_engine_data_type_controller.cc	(revision 0)
+++ chrome/browser/sync/glue/search_engine_data_type_controller.cc	(revision 0)
@@ -0,0 +1,93 @@
+// Copyright (c) 2011 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/search_engine_data_type_controller.h"
+
+#include "base/metrics/histogram.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search_engines/template_url_service.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/sync/api/syncable_service.h"
+#include "chrome/browser/sync/glue/generic_change_processor.h"
+#include "chrome/browser/sync/profile_sync_factory.h"
+#include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/common/notification_source.h"
+
+namespace browser_sync {
+
+SearchEngineDataTypeController::SearchEngineDataTypeController(
+    ProfileSyncFactory* profile_sync_factory,
+    Profile* profile,
+    ProfileSyncService* sync_service)
+    : FrontendDataTypeController(profile_sync_factory,
+                                 profile,
+                                 sync_service) {
+}
+
+SearchEngineDataTypeController::~SearchEngineDataTypeController() {
+}
+
+syncable::ModelType SearchEngineDataTypeController::type() const {
+  return syncable::SEARCH_ENGINES;
+}
+
+void SearchEngineDataTypeController::Observe(
+    int type,
+    const NotificationSource& source,
+    const NotificationDetails& details) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_EQ(chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED, type);
+  registrar_.RemoveAll();
+  DCHECK_EQ(state_, MODEL_STARTING);
+  state_ = ASSOCIATING;
+  Associate();
+}
+
+// We want to start the bookmark model before we begin associating.

[Nicolas Zea, 2011/08/19 18:32:39]

Rewrite comment

[SteveT, 2011/08/22 18:33:42]

Done.

+bool SearchEngineDataTypeController::StartModels() {
+  // If the TemplateURLService is loaded, continue with association.
+  TemplateURLService* turl_service =
+      TemplateURLServiceFactory::GetForProfile(profile_);
+  if (turl_service && turl_service->loaded()) {
+    return true;  // Continue to Associate().
+  }
+
+  // Add an observer and continue when the bookmarks model is loaded.

[Nicolas Zea, 2011/08/19 18:32:39]

here too

[SteveT, 2011/08/22 18:33:42]

Done.

+  registrar_.Add(this, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
+                 Source<Profile>(sync_service_->profile()));
+  return false;  // Don't continue Start.
+}
+
+// Cleanup for our extra registrar usage.
+void SearchEngineDataTypeController::CleanUpState() {
+  registrar_.RemoveAll();
+}
+
+void SearchEngineDataTypeController::CreateSyncComponents() {
+  ProfileSyncFactory::SyncComponents sync_components =
+      profile_sync_factory_->CreateSearchEngineSyncComponents(sync_service_,
+                                                              this);
+  set_model_associator(sync_components.model_associator);
+  set_change_processor(sync_components.change_processor);
+}
+
+void SearchEngineDataTypeController::RecordUnrecoverableError(
+    const tracked_objects::Location& from_here,
+    const std::string& message) {
+  UMA_HISTOGRAM_COUNTS("Sync.SearchEngineRunFailures", 1);

[Nicolas Zea, 2011/08/19 18:32:39]

note: you're going to have to add these to histograms.xml in tools/histograms,
but that can be a separate cl

[SteveT, 2011/08/22 18:33:42]

Noted.

+}
+
+void SearchEngineDataTypeController::RecordAssociationTime(
+    base::TimeDelta time) {
+  UMA_HISTOGRAM_TIMES("Sync.SearchEngineAssociationTime", time);
+}
+
+void SearchEngineDataTypeController::RecordStartFailure(StartResult result) {
+  UMA_HISTOGRAM_ENUMERATION("Sync.SearchEngineStartFailures",
+                            result,
+                            MAX_START_RESULT);
+}
+
+}  // namespace browser_sync
Property changes on: chrome\browser\sync\glue\search_engine_data_type_controller.cc
___________________________________________________________________
Added: svn:eol-style
   + LF