Sync: Fix RequestResume in SyncerThread, and re-enable the various unit tests...

chrome/browser/sync/engine/syncer_thread.cc

 // Copyright (c) 2010 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/engine/syncer_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_MACOSX)
 #include <CoreFoundation/CFNumber.h>
 #include <IOKit/IOTypes.h>
 #include <IOKit/IOKitLib.h>
 #endif
 
 #include <algorithm>
 #include <map>
 #include <queue>
 
 #include "base/rand_util.h"
-#include "base/stringprintf.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "chrome/browser/sync/engine/model_safe_worker.h"
 #include "chrome/browser/sync/engine/net/server_connection_manager.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/sessions/session_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "jingle/notifier/listener/notification_constants.h"
 
 using std::priority_queue;
 using std::min;
@@ skipping 167 matching lines @@
   AutoLock lock(lock_);
   // Only valid to request a resume when we are already paused or we
   // have a pause pending.
   if (!(vault_.paused_ || vault_.pause_requested_))
     return false;
 
   if (thread_.IsRunning()) {
     if (vault_.pause_requested_) {
       // If pause was requested we have not yet paused.  In this case,
       // the resume cancels the pause request.
+      vault_.pause_requested_ = false;
+      vault_field_changed_.Broadcast();
       Notify(SyncEngineEvent::SYNCER_THREAD_RESUMED);
       VLOG(1) << "Pending pause canceled by resume.";
     } else {
       // Unpause and notify.
       vault_.paused_ = false;
       vault_field_changed_.Broadcast();
     }
   } else {
     ExitPausedState();
     VLOG(1) << "Resumed while not running.";
@@ skipping 578 matching lines @@
     was_logged = true;
     VLOG(1) << "UserIdleTime unimplemented on this platform, synchronization "
                "will not throttle when user idle";
   }
 #endif
 
   return 0;
 }
 
 }  // namespace browser_sync