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

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

Issue 8785015: Revert 112815 - [Sync] Make syncer commands avoid posting tasks on threads with no work to do (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
Index: chrome/browser/sync/engine/apply_updates_command_unittest.cc
===================================================================
--- chrome/browser/sync/engine/apply_updates_command_unittest.cc (revision 112854)
+++ chrome/browser/sync/engine/apply_updates_command_unittest.cc (working copy)
@@ -57,11 +57,12 @@
make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
workers()->push_back(
make_scoped_refptr(new FakeModelWorker(GROUP_PASSWORD)));
+ workers()->push_back(
+ make_scoped_refptr(new FakeModelWorker(GROUP_PASSIVE)));
(*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;
(*mutable_routing_info())[syncable::PASSWORDS] = GROUP_PASSWORD;
(*mutable_routing_info())[syncable::NIGORI] = GROUP_PASSIVE;
SyncerCommandTest::SetUp();
- ExpectNoGroupsToChange(apply_updates_command_);
}
// Create a new unapplied folder node with a parent.
@@ -159,7 +160,6 @@
DefaultBookmarkSpecifics(),
"parent");
- ExpectGroupToChange(apply_updates_command_, GROUP_UI);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -195,7 +195,6 @@
DefaultBookmarkSpecifics(),
"parent");
- ExpectGroupToChange(apply_updates_command_, GROUP_UI);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -219,7 +218,6 @@
DefaultBookmarkSpecifics(),
"some_item");
- ExpectGroupToChange(apply_updates_command_, GROUP_UI);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -256,7 +254,6 @@
DefaultBookmarkSpecifics(),
root_server_id);
- ExpectGroupToChange(apply_updates_command_, GROUP_UI);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -295,7 +292,6 @@
specifics.MutableExtension(sync_pb::password)->mutable_encrypted());
CreateUnappliedNewItem("item", specifics, false);
- ExpectGroupToChange(apply_updates_command_, GROUP_PASSWORD);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -324,7 +320,6 @@
encrypted_password.MutableExtension(sync_pb::password);
CreateUnappliedNewItem("item3", encrypted_password, false);
- ExpectGroupsToChange(apply_updates_command_, GROUP_UI, GROUP_PASSWORD);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -399,7 +394,6 @@
CreateUnappliedNewItem("item2", specifics, false);
}
- ExpectGroupToChange(apply_updates_command_, GROUP_PASSWORD);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -454,7 +448,6 @@
specifics, true);
EXPECT_FALSE(cryptographer->has_pending_keys());
- ExpectGroupToChange(apply_updates_command_, GROUP_PASSIVE);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -506,7 +499,6 @@
specifics, true);
EXPECT_FALSE(cryptographer->has_pending_keys());
- ExpectGroupToChange(apply_updates_command_, GROUP_PASSIVE);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -594,7 +586,6 @@
EXPECT_EQ(2*batch_s+1, handles.size());
}
- ExpectGroupToChange(apply_updates_command_, GROUP_PASSIVE);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();
@@ -697,7 +688,6 @@
EXPECT_EQ(2*batch_s+1, handles.size());
}
- ExpectGroupToChange(apply_updates_command_, GROUP_PASSIVE);
apply_updates_command_.ExecuteImpl(session());
sessions::StatusController* status = session()->mutable_status_controller();

Powered by Google App Engine
This is Rietveld 408576698