Merge 136934 - Notify sync observers whenever preferred types change

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 90 matching lines @@
     Profile* profile,
     const std::string& username,
     const std::string& password)
     : waiting_for_encryption_type_(syncable::UNSPECIFIED),
       wait_state_(INITIAL_WAIT_STATE),
       profile_(profile),
       service_(NULL),
       timestamp_match_partner_(NULL),
       username_(username),
       password_(password),
-      profile_debug_name_(profile->GetDebugName()) {
+      profile_debug_name_(profile->GetDebugName()),
+      waiting_for_status_change_(false) {
   if (IsSyncAlreadySetup()) {
     service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
         profile_);
     service_->AddObserver(this);
     ignore_result(TryListeningToMigrationEvents());
     wait_state_ = FULLY_SYNCED;
   }
 }
 
 ProfileSyncServiceHarness::~ProfileSyncServiceHarness() {}
@@ skipping 133 matching lines @@
   return false;
 }
 
 void ProfileSyncServiceHarness::SignalStateCompleteWithNextState(
     WaitState next_state) {
   wait_state_ = next_state;
   SignalStateComplete();
 }
 
 void ProfileSyncServiceHarness::SignalStateComplete() {
-  MessageLoop::current()->Quit();
+  if (waiting_for_status_change_)
+    MessageLoop::current()->Quit();
 }
 
 bool ProfileSyncServiceHarness::RunStateChangeMachine() {
   WaitState original_wait_state = wait_state_;
   switch (wait_state_) {
     case WAITING_FOR_ON_BACKEND_INITIALIZED: {
       DVLOG(1) << GetClientInfoString("WAITING_FOR_ON_BACKEND_INITIALIZED");
       if (service()->sync_initialized()) {
         // The sync backend is initialized.
         SignalStateCompleteWithNextState(WAITING_FOR_INITIAL_SYNC);
@@ skipping 447 matching lines @@
     int timeout_milliseconds,
     const std::string& reason) {
   DVLOG(1) << GetClientInfoString("AwaitStatusChangeWithTimeout");
   if (wait_state_ == SYNC_DISABLED) {
     LOG(ERROR) << "Sync disabled for " << profile_debug_name_ << ".";
     return false;
   }
   scoped_refptr<StateChangeTimeoutEvent> timeout_signal(
       new StateChangeTimeoutEvent(this, reason));
   {
+    // Set the flag to tell SignalStateComplete() that it's OK to quit out of
+    // the MessageLoop if we hit a state transition.
+    waiting_for_status_change_ = true;
     MessageLoop* loop = MessageLoop::current();
     MessageLoop::ScopedNestableTaskAllower allow(loop);
     loop->PostDelayedTask(
         FROM_HERE,
         base::Bind(&StateChangeTimeoutEvent::Callback,
                    timeout_signal.get()),
         base::TimeDelta::FromMilliseconds(timeout_milliseconds));
     loop->Run();
+    waiting_for_status_change_ = false;
   }
 
   if (timeout_signal->Abort()) {
     DVLOG(1) << GetClientInfoString("AwaitStatusChangeWithTimeout succeeded");
     return true;
   } else {
     DVLOG(0) << GetClientInfoString("AwaitStatusChangeWithTimeout timed out");
     return false;
   }
 }
@@ skipping 233 matching lines @@
     const std::string& message) {
   std::stringstream os;
   os << profile_debug_name_ << ": " << message << ": ";
   if (service()) {
     const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
     const ProfileSyncService::Status& status = GetStatus();
     // Capture select info from the sync session snapshot and syncer status.
     os << "has_more_to_sync: "
        << snap.has_more_to_sync()
        << ", has_unsynced_items: "
-       << service()->HasUnsyncedItems()
+       << (service()->sync_initialized() ? service()->HasUnsyncedItems() : 0)
        << ", unsynced_count: "
        << snap.unsynced_count()
        << ", encryption conflicts: "
        << snap.num_encryption_conflicts()
        << ", hierarchy conflicts: "
        << snap.num_hierarchy_conflicts()
        << ", simple conflicts: "
        << snap.num_simple_conflicts()
        << ", server conflicts: "
        << snap.num_server_conflicts()
@@ skipping 94 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::WriteWithOptions(&value,
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }