[Sync] Make EnableDisableSingleClientTest more robust.

chrome/browser/sync/test/integration/profile_sync_service_harness.cc

 // Copyright 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/test/integration/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <sstream>
@@ skipping 311 matching lines @@
       + std::string(syncer::ModelTypeToString(datatype)) + ")");
 
   if (IsSyncDisabled())
     return SetupSync(syncer::ModelTypeSet(datatype));
 
   if (service() == nullptr) {
     LOG(ERROR) << "EnableSyncForDatatype(): service() is null.";
     return false;
   }
 
+  if (!syncer::UserSelectableTypes().Has(datatype)) {
+    LOG(ERROR) << "Can only enable user selectable types, requested "
+               << syncer::ModelTypeToString(datatype);
+    return false;
+  }
+
   syncer::ModelTypeSet synced_datatypes = service()->GetPreferredDataTypes();
   if (synced_datatypes.Has(datatype)) {
     DVLOG(1) << "EnableSyncForDatatype(): Sync already enabled for datatype "
              << syncer::ModelTypeToString(datatype)
              << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   synced_datatypes.Put(syncer::ModelTypeFromInt(datatype));
   synced_datatypes.RetainAll(syncer::UserSelectableTypes());
@@ skipping 13 matching lines @@
     syncer::ModelType datatype) {
   DVLOG(1) << GetClientInfoString(
       "DisableSyncForDatatype("
       + std::string(syncer::ModelTypeToString(datatype)) + ")");
 
   if (service() == nullptr) {
     LOG(ERROR) << "DisableSyncForDatatype(): service() is null.";
     return false;
   }
 
+  if (!syncer::UserSelectableTypes().Has(datatype)) {
+    LOG(ERROR) << "Can only disable user selectable types, requested "
+               << syncer::ModelTypeToString(datatype);
+    return false;
+  }
+
   syncer::ModelTypeSet synced_datatypes = service()->GetPreferredDataTypes();
   if (!synced_datatypes.Has(datatype)) {
     DVLOG(1) << "DisableSyncForDatatype(): Sync already disabled for datatype "
              << syncer::ModelTypeToString(datatype)
              << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   synced_datatypes.RetainAll(syncer::UserSelectableTypes());
   synced_datatypes.Remove(datatype);
@@ skipping 89 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   std::unique_ptr<base::DictionaryValue> value(
       syncer::sync_ui_util::ConstructAboutInformation(
           service(), service()->signin(), chrome::GetChannel()));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(
       *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &service_status);
   return service_status;
 }