Unrevert "[Sync] Split GetPreferredTypes into GetActiveType...""

chrome/browser/sync/profile_sync_service_harness.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 "chrome/browser/sync/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 827 matching lines @@
   // TODO(akalin): Shouldn't this belong with the intersection check?
   // Otherwise, this function isn't symmetric.
   if (!IsFullySynced()) {
     DVLOG(2) << profile_debug_name_ << ": not synced, assuming doesn't match";
     return false;
   }
 
   // Only look for a match if we have at least one enabled datatype in
   // common with the partner client.
   const syncer::ModelTypeSet common_types =
-      Intersection(service()->GetPreferredDataTypes(),
-                   partner->service()->GetPreferredDataTypes());
+      Intersection(service()->GetActiveDataTypes(),
+                   partner->service()->GetActiveDataTypes());
 
   DVLOG(2) << profile_debug_name_ << ", " << partner->profile_debug_name_
            << ": common types are "
            << syncer::ModelTypeSetToString(common_types);
 
   if (!common_types.Empty() && !partner->IsFullySynced()) {
     DVLOG(2) << "non-empty common types and "
              << partner->profile_debug_name_ << " isn't synced";
     return false;
   }
@@ skipping 267 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   scoped_ptr<DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service_));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }