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

Side by Side Diff: chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm

Issue 2753753005: [sync] WebContentsObserver based sessions notifications (Closed)
Patch Set: use base:MakeUnique, alphabetize Created 3 years, 9 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
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/mac/scoped_nsobject.h" 6 #include "base/mac/scoped_nsobject.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 "device_id")) {} 69 "device_id")) {}
70 70
71 void SetUp() override { 71 void SetUp() override {
72 CocoaProfileTest::SetUp(); 72 CocoaProfileTest::SetUp();
73 ASSERT_TRUE(browser()); 73 ASSERT_TRUE(browser());
74 74
75 controller_.reset([[AppMenuController alloc] initWithBrowser:browser()]); 75 controller_.reset([[AppMenuController alloc] initWithBrowser:browser()]);
76 fake_model_.reset(new MockAppMenuModel); 76 fake_model_.reset(new MockAppMenuModel);
77 77
78 sync_prefs_.reset(new syncer::SyncPrefs(profile()->GetPrefs())); 78 sync_prefs_.reset(new syncer::SyncPrefs(profile()->GetPrefs()));
79 dummy_router_.reset(new DummyRouter());
79 manager_.reset(new sync_sessions::SessionsSyncManager( 80 manager_.reset(new sync_sessions::SessionsSyncManager(
80 ProfileSyncServiceFactory::GetForProfile(profile()) 81 ProfileSyncServiceFactory::GetForProfile(profile())
81 ->GetSyncClient() 82 ->GetSyncClient()
82 ->GetSyncSessionsClient(), 83 ->GetSyncSessionsClient(),
83 sync_prefs_.get(), local_device_.get(), 84 sync_prefs_.get(), local_device_.get(), dummy_router_.get(),
84 std::unique_ptr<sync_sessions::LocalSessionEventRouter>(
85 new DummyRouter()),
86 base::Closure(), base::Closure())); 85 base::Closure(), base::Closure()));
87 manager_->MergeDataAndStartSyncing( 86 manager_->MergeDataAndStartSyncing(
88 syncer::SESSIONS, syncer::SyncDataList(), 87 syncer::SESSIONS, syncer::SyncDataList(),
89 std::unique_ptr<syncer::SyncChangeProcessor>( 88 std::unique_ptr<syncer::SyncChangeProcessor>(
90 new syncer::FakeSyncChangeProcessor), 89 new syncer::FakeSyncChangeProcessor),
91 std::unique_ptr<syncer::SyncErrorFactory>( 90 std::unique_ptr<syncer::SyncErrorFactory>(
92 new syncer::SyncErrorFactoryMock)); 91 new syncer::SyncErrorFactoryMock));
93 } 92 }
94 93
95 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { 94 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
(...skipping 14 matching lines...) Expand all
110 AppMenuController* controller() { 109 AppMenuController* controller() {
111 return controller_.get(); 110 return controller_.get();
112 } 111 }
113 112
114 base::scoped_nsobject<AppMenuController> controller_; 113 base::scoped_nsobject<AppMenuController> controller_;
115 114
116 std::unique_ptr<MockAppMenuModel> fake_model_; 115 std::unique_ptr<MockAppMenuModel> fake_model_;
117 116
118 private: 117 private:
119 std::unique_ptr<syncer::SyncPrefs> sync_prefs_; 118 std::unique_ptr<syncer::SyncPrefs> sync_prefs_;
119 std::unique_ptr<DummyRouter> dummy_router_;
120 std::unique_ptr<sync_sessions::SessionsSyncManager> manager_; 120 std::unique_ptr<sync_sessions::SessionsSyncManager> manager_;
121 std::unique_ptr<syncer::LocalDeviceInfoProviderMock> local_device_; 121 std::unique_ptr<syncer::LocalDeviceInfoProviderMock> local_device_;
122 }; 122 };
123 123
124 TEST_F(AppMenuControllerTest, Initialized) { 124 TEST_F(AppMenuControllerTest, Initialized) {
125 EXPECT_TRUE([controller() menu]); 125 EXPECT_TRUE([controller() menu]);
126 EXPECT_GE([[controller() menu] numberOfItems], 5); 126 EXPECT_GE([[controller() menu] numberOfItems], 5);
127 } 127 }
128 128
129 TEST_F(AppMenuControllerTest, DispatchSimple) { 129 TEST_F(AppMenuControllerTest, DispatchSimple) {
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 BrowserRemovedObserver observer; 262 BrowserRemovedObserver observer;
263 // This is normally called by ToolbarController, but since |controller_| is 263 // This is normally called by ToolbarController, but since |controller_| is
264 // not owned by one, call it here. 264 // not owned by one, call it here.
265 [controller_ browserWillBeDestroyed]; 265 [controller_ browserWillBeDestroyed];
266 CloseBrowserWindow(); 266 CloseBrowserWindow();
267 observer.WaitUntilBrowserRemoved(); 267 observer.WaitUntilBrowserRemoved();
268 // |controller_| is released in TearDown(). 268 // |controller_| is released in TearDown().
269 } 269 }
270 270
271 } // namespace 271 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698