sync/notifier/sync_notifier_factory_unittest.cc - Issue 10702074: Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver

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

Issue 10702074: Refactor sync-specific parts out of SyncNotifier/SyncNotifierObserver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review changes 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

OLD	NEW
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/sync_notifier_factory.h"	5 #include "sync/notifier/sync_notifier_factory.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/memory/ref_counted.h"	9 #include "base/memory/ref_counted.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 notifier_options_.notification_method = notifier::NOTIFICATION_SERVER;	53 notifier_options_.notification_method = notifier::NOTIFICATION_SERVER;

54 SyncNotifierFactory factory(	54 SyncNotifierFactory factory(

55 notifier_options_,	55 notifier_options_,

56 "test client info",	56 "test client info",

57 base::WeakPtr<InvalidationStateTracker>());	57 base::WeakPtr<InvalidationStateTracker>());

58 scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier());	58 scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier());

59 #if defined(OS_ANDROID)	59 #if defined(OS_ANDROID)

60 ASSERT_FALSE(notifier.get());	60 ASSERT_FALSE(notifier.get());

61 #else	61 #else

62 ASSERT_TRUE(notifier.get());	62 ASSERT_TRUE(notifier.get());

63 notifier->AddObserver(&mock_observer_);	63 ObjectIdSet ids = ModelTypeSetToObjectIdSet(ModelTypeSet(syncer::BOOKMARKS));

64 notifier->RemoveObserver(&mock_observer_);	64 notifier->UpdateRegisteredIds(&mock_observer_, ids);

	65 notifier->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());

65 #endif	66 #endif

66 }	67 }

67	68

68 // Test basic creation of a P2PNotifier.	69 // Test basic creation of a P2PNotifier.

69 TEST_F(SyncNotifierFactoryTest, Basic_P2P) {	70 TEST_F(SyncNotifierFactoryTest, Basic_P2P) {

70 notifier_options_.notification_method = notifier::NOTIFICATION_P2P;	71 notifier_options_.notification_method = notifier::NOTIFICATION_P2P;

71 SyncNotifierFactory factory(	72 SyncNotifierFactory factory(

72 notifier_options_,	73 notifier_options_,

73 "test client info",	74 "test client info",

74 base::WeakPtr<InvalidationStateTracker>());	75 base::WeakPtr<InvalidationStateTracker>());

75 scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier());	76 scoped_ptr<SyncNotifier> notifier(factory.CreateSyncNotifier());

76 #if defined(OS_ANDROID)	77 #if defined(OS_ANDROID)

77 ASSERT_FALSE(notifier.get());	78 ASSERT_FALSE(notifier.get());

78 #else	79 #else

79 ASSERT_TRUE(notifier.get());	80 ASSERT_TRUE(notifier.get());

80 notifier->AddObserver(&mock_observer_);	81 ObjectIdSet ids = ModelTypeSetToObjectIdSet(ModelTypeSet(syncer::BOOKMARKS));

81 notifier->RemoveObserver(&mock_observer_);	82 notifier->UpdateRegisteredIds(&mock_observer_, ids);

	83 notifier->UpdateRegisteredIds(&mock_observer_, ObjectIdSet());

82 #endif	84 #endif

83 }	85 }

84	86

85 } // namespace	87 } // namespace

86 } // namespace syncer	88 } // namespace syncer

OLD	NEW

« no previous file with comments | « sync/notifier/sync_notifier.h ('k') | sync/notifier/sync_notifier_helper.h » ('j') | sync/notifier/sync_notifier_helper.h » ('J')