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

Side by Side Diff: sync/sessions/sync_session_unittest.cc

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "sync/sessions/sync_session.h" 5 #include "sync/sessions/sync_session.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "sync/engine/conflict_resolver.h" 11 #include "sync/engine/conflict_resolver.h"
12 #include "sync/engine/syncer_types.h" 12 #include "sync/engine/syncer_types.h"
13 #include "sync/engine/throttled_data_type_tracker.h" 13 #include "sync/engine/throttled_data_type_tracker.h"
14 #include "sync/internal_api/public/syncable/model_type.h" 14 #include "sync/internal_api/public/syncable/model_type.h"
15 #include "sync/sessions/session_state.h" 15 #include "sync/sessions/session_state.h"
16 #include "sync/sessions/status_controller.h" 16 #include "sync/sessions/status_controller.h"
17 #include "sync/syncable/syncable_id.h" 17 #include "sync/syncable/syncable_id.h"
18 #include "sync/syncable/write_transaction.h" 18 #include "sync/syncable/write_transaction.h"
19 #include "sync/test/engine/fake_model_worker.h" 19 #include "sync/test/engine/fake_model_worker.h"
20 #include "sync/test/engine/test_directory_setter_upper.h" 20 #include "sync/test/engine/test_directory_setter_upper.h"
21 #include "sync/test/fake_extensions_activity_monitor.h" 21 #include "sync/test/fake_extensions_activity_monitor.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 namespace syncer {
25
24 using syncable::WriteTransaction; 26 using syncable::WriteTransaction;
25 27
26 namespace syncer {
27 namespace sessions { 28 namespace sessions {
28 namespace { 29 namespace {
29 30
30 class SyncSessionTest : public testing::Test, 31 class SyncSessionTest : public testing::Test,
31 public SyncSession::Delegate { 32 public SyncSession::Delegate {
32 public: 33 public:
33 SyncSessionTest() : controller_invocations_allowed_(false) {} 34 SyncSessionTest() : controller_invocations_allowed_(false) {}
34 35
35 SyncSession* MakeSession() { 36 SyncSession* MakeSession() {
36 std::vector<ModelSafeWorker*> workers; 37 std::vector<ModelSafeWorker*> workers;
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]); 531 EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);
531 EXPECT_EQ(payload1, original[syncable::PASSWORDS]); 532 EXPECT_EQ(payload1, original[syncable::PASSWORDS]);
532 EXPECT_EQ(payload1, original[syncable::AUTOFILL]); 533 EXPECT_EQ(payload1, original[syncable::AUTOFILL]);
533 EXPECT_EQ(payload2, original[syncable::SESSIONS]); 534 EXPECT_EQ(payload2, original[syncable::SESSIONS]);
534 EXPECT_EQ(payload3, original[syncable::THEMES]); 535 EXPECT_EQ(payload3, original[syncable::THEMES]);
535 } 536 }
536 537
537 } // namespace 538 } // namespace
538 } // namespace sessions 539 } // namespace sessions
539 } // namespace syncer 540 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698