[Sync] Make SESSIONS an implicit type

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 14 matching lines @@
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "sync/internal_api/public/base/progress_marker_map.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 #include "sync/internal_api/public/util/sync_string_conversions.h"
 
 using syncer::sessions::SyncSessionSnapshot;
 
+namespace {
+
 // TODO(rsimha): Remove the following lines once crbug.com/91863 is fixed.
 // The amount of time for which we wait for a live sync operation to complete.
 static const int kLiveSyncOperationTimeoutMs = 45000;
 
 // The amount of time we wait for test cases that verify exponential backoff.
 static const int kExponentialBackoffVerificationTimeoutMs = 60000;
 
+syncer::ModelTypeSet GetUserVisibleTypes() {
+  syncer::ModelTypeSet user_visible_types(syncer::UserTypes());
+  user_visible_types.Remove(syncer::APP_NOTIFICATIONS);
+  user_visible_types.Remove(syncer::APP_SETTINGS);
+  user_visible_types.Remove(syncer::AUTOFILL_PROFILE);
+  user_visible_types.Remove(syncer::EXTENSION_SETTINGS);
+  user_visible_types.Remove(syncer::SEARCH_ENGINES);
+  user_visible_types.Remove(syncer::SESSIONS);
+  user_visible_types.Remove(syncer::HISTORY_DELETE_DIRECTIVES);
+  return user_visible_types;
+}
+
+}
+
 // Simple class to implement a timeout using PostDelayedTask.  If it is not
 // aborted before picked up by a message queue, then it asserts with the message
 // provided.  This class is not thread safe.
 class StateChangeTimeoutEvent
     : public base::RefCountedThreadSafe<StateChangeTimeoutEvent> {
  public:
   StateChangeTimeoutEvent(ProfileSyncServiceHarness* caller,
                           const std::string& message);
 
   // The entry point to the class from PostDelayedTask.
@@ skipping 872 matching lines @@
 
   DVLOG(0) << GetClientInfoString("EnableSyncForDatatype failed");
   return false;
 }
 
 bool ProfileSyncServiceHarness::DisableSyncForDatatype(
     syncer::ModelType datatype) {
   DVLOG(1) << GetClientInfoString(
       "DisableSyncForDatatype("
       + std::string(syncer::ModelTypeToString(datatype)) + ")");
-
   if (service() == NULL) {
     LOG(ERROR) << "DisableSyncForDatatype(): service() is null.";
     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(GetUserVisibleTypes());
   synced_datatypes.Remove(datatype);
+
   service()->OnUserChoseDatatypes(false, synced_datatypes);
   if (AwaitFullSyncCompletion("Datatype reconfiguration.")) {
     DVLOG(1) << "DisableSyncForDatatype(): Disabled sync for datatype "
              << syncer::ModelTypeToString(datatype)
              << " on " << profile_debug_name_ << ".";
     return true;
   }
 
   DVLOG(0) << GetClientInfoString("DisableSyncForDatatype failed");
   return false;
@@ skipping 163 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;
 }