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

Side by Side Diff: sync/notifier/p2p_notifier_unittest.cc

Issue 10690071: [Sync] Move model_type* from syncable/ to base/ (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
« no previous file with comments | « sync/notifier/p2p_notifier.cc ('k') | sync/notifier/sync_notifier.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/notifier/p2p_notifier.h" 5 #include "sync/notifier/p2p_notifier.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "jingle/notifier/listener/fake_push_client.h" 9 #include "jingle/notifier/listener/fake_push_client.h"
10 #include "sync/internal_api/public/syncable/model_type.h" 10 #include "sync/internal_api/public/base/model_type.h"
11 #include "sync/notifier/mock_sync_notifier_observer.h" 11 #include "sync/notifier/mock_sync_notifier_observer.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace syncer { 14 namespace syncer {
15 15
16 namespace { 16 namespace {
17 17
18 using ::testing::_; 18 using ::testing::_;
19 using ::testing::Mock; 19 using ::testing::Mock;
20 using ::testing::StrictMock; 20 using ::testing::StrictMock;
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 Mock::VerifyAndClearExpectations(&mock_observer_); 282 Mock::VerifyAndClearExpectations(&mock_observer_);
283 p2p_notifier_.SendNotificationDataForTest( 283 p2p_notifier_.SendNotificationDataForTest(
284 P2PNotificationData("sender2", NOTIFY_ALL, syncable::ModelTypeSet())); 284 P2PNotificationData("sender2", NOTIFY_ALL, syncable::ModelTypeSet()));
285 285
286 ReflectSentNotifications(); 286 ReflectSentNotifications();
287 } 287 }
288 288
289 } // namespace 289 } // namespace
290 290
291 } // namespace syncer 291 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/notifier/p2p_notifier.cc ('k') | sync/notifier/sync_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698