[Sync] Add a sanity integration test for USS.

components/browser_sync/browser/profile_sync_components_factory_impl.cc

 // Copyright (c) 2012 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 "components/browser_sync/browser/profile_sync_components_factory_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 124 matching lines @@
   syncer::ModelTypeSet disabled_types =
       GetDisabledTypesFromCommandLine(command_line_);
   syncer::ModelTypeSet enabled_types =
       GetEnabledTypesFromCommandLine(command_line_);
   RegisterCommonDataTypes(sync_service, disabled_types, enabled_types);
   if (!register_platform_types_method.is_null())
     register_platform_types_method.Run(sync_service, disabled_types,
                                        enabled_types);
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(

[skym, 2016/09/12 19:57:50]

This whole method makes me sad.

[maxbogue, 2016/09/13 03:44:54]

SAME! It's so awkward and clunky. Should probs be two methods: "is this datatype
enabled?" and "gimme the DTC for this datatype."

     sync_driver::SyncService* sync_service,
     syncer::ModelTypeSet disabled_types,
     syncer::ModelTypeSet enabled_types) {
   base::Closure error_callback =
       base::Bind(&ChromeReportUnrecoverableError, channel_);
 
   // TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
   if (channel_ == version_info::Channel::UNKNOWN &&
       command_line_.HasSwitch(switches::kSyncEnableUSSDeviceInfo)) {
     sync_service->RegisterDataTypeController(
@@ skipping 98 matching lines @@
   // disabled.
   if (!disabled_types.Has(syncer::PASSWORDS)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<PasswordDataTypeController>(
             error_callback, sync_client_,
             sync_client_->GetPasswordStateChangedCallback(), password_store_));
   }
 
   if (!disabled_types.Has(syncer::PREFERENCES) &&
       base::FeatureList::IsEnabled(kSyncPreferencesFeature)) {
-    sync_service->RegisterDataTypeController(
-        base::MakeUnique<UIDataTypeController>(syncer::PREFERENCES,
-                                               error_callback, sync_client_));
+    if (!override_prefs_for_uss_test_) {
+      sync_service->RegisterDataTypeController(
+          base::MakeUnique<UIDataTypeController>(syncer::PREFERENCES,
+                                                 error_callback, sync_client_));
+    } else {
+      sync_service->RegisterDataTypeController(
+          base::MakeUnique<UIModelTypeController>(
+              syncer::PREFERENCES, error_callback, sync_client_));
+    }
   }
 
   if (!disabled_types.Has(syncer::PRIORITY_PREFERENCES)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<UIDataTypeController>(syncer::PRIORITY_PREFERENCES,
                                                error_callback, sync_client_));
   }
 
   // Article sync is disabled by default.  Register only if explicitly enabled.
   if (dom_distiller::IsEnableSyncArticlesSet()) {
@@ skipping 129 matching lines @@
   const bool kExpectMobileBookmarksFolder = false;
 #endif
   BookmarkModelAssociator* model_associator = new BookmarkModelAssociator(
       bookmark_model, sync_service->GetSyncClient(), user_share,
       error_handler->Copy(), kExpectMobileBookmarksFolder);
   BookmarkChangeProcessor* change_processor =
       new BookmarkChangeProcessor(sync_service->GetSyncClient(),
                                   model_associator, std::move(error_handler));
   return SyncComponents(model_associator, change_processor);
 }
+
+// static
+void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest() {
+  override_prefs_for_uss_test_ = true;
+}
+
+bool ProfileSyncComponentsFactoryImpl::override_prefs_for_uss_test_ = false;

[skym, 2016/09/12 19:57:50]

Why not do this assignment in the .h file?

[maxbogue, 2016/09/13 03:44:54]

Can't :(