Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(900)

Unified Diff: chrome/browser/sync/engine/syncer_thread.cc

Issue 5047002: Sync: Fix RequestResume in SyncerThread, and re-enable the various unit tests... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncer_thread_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_thread.cc
===================================================================
--- chrome/browser/sync/engine/syncer_thread.cc (revision 66118)
+++ chrome/browser/sync/engine/syncer_thread.cc (working copy)
@@ -16,7 +16,6 @@
#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"
@@ -204,6 +203,8 @@
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 {
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncer_thread_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698