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

Unified Diff: sync/engine/download_updates_command_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 months 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 | « sync/engine/download_updates_command.cc ('k') | sync/engine/get_commit_ids_command.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/download_updates_command_unittest.cc
diff --git a/sync/engine/download_updates_command_unittest.cc b/sync/engine/download_updates_command_unittest.cc
index ed0d6bbb63654d4f221aab9d65f0e210ae9e9e05..88b97c0cd48fdb3735b45fc15c481d4ed9e3c904 100644
--- a/sync/engine/download_updates_command_unittest.cc
+++ b/sync/engine/download_updates_command_unittest.cc
@@ -11,10 +11,8 @@
#include "sync/test/engine/syncer_command_test.h"
using ::testing::_;
-namespace syncer {
-using syncable::FIRST_REAL_MODEL_TYPE;
-using syncable::MODEL_TYPE_COUNT;
+namespace syncer {
// A test fixture for tests exercising DownloadUpdatesCommandTest.
class DownloadUpdatesCommandTest : public SyncerCommandTest {
@@ -29,9 +27,9 @@ class DownloadUpdatesCommandTest : public SyncerCommandTest {
make_scoped_refptr(new FakeModelWorker(GROUP_DB)));
workers()->push_back(
make_scoped_refptr(new FakeModelWorker(GROUP_UI)));
- (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB;
- (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;
- (*mutable_routing_info())[syncable::PREFERENCES] = GROUP_UI;
+ (*mutable_routing_info())[syncer::AUTOFILL] = GROUP_DB;
+ (*mutable_routing_info())[syncer::BOOKMARKS] = GROUP_UI;
+ (*mutable_routing_info())[syncer::PREFERENCES] = GROUP_UI;
SyncerCommandTest::SetUp();
}
@@ -51,9 +49,9 @@ TEST_F(DownloadUpdatesCommandTest, ExecuteNoPayloads) {
TEST_F(DownloadUpdatesCommandTest, ExecuteWithPayloads) {
ConfigureMockServerConnection();
sessions::SyncSourceInfo source;
- source.types[syncable::AUTOFILL] = "autofill_payload";
- source.types[syncable::BOOKMARKS] = "bookmark_payload";
- source.types[syncable::PREFERENCES] = "preferences_payload";
+ source.types[syncer::AUTOFILL] = "autofill_payload";
+ source.types[syncer::BOOKMARKS] = "bookmark_payload";
+ source.types[syncer::PREFERENCES] = "preferences_payload";
mock_server()->ExpectGetUpdatesRequestTypes(
GetRoutingInfoTypes(routing_info()));
mock_server()->ExpectGetUpdatesRequestPayloads(source.types);
« no previous file with comments | « sync/engine/download_updates_command.cc ('k') | sync/engine/get_commit_ids_command.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698