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

Side by Side Diff: chrome/browser/sync/sessions/session_data_type_controller_unittest.cc

Issue 780713002: Fix remaining WeakPtrFactory ordering problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 6 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/memory/weak_ptr.h" 7 #include "base/memory/weak_ptr.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/sync/glue/synced_window_delegate.h" 10 #include "chrome/browser/sync/glue/synced_window_delegate.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 private: 76 private:
77 std::set<SyncedWindowDelegate*> delegates_; 77 std::set<SyncedWindowDelegate*> delegates_;
78 }; 78 };
79 79
80 class SessionDataTypeControllerTest 80 class SessionDataTypeControllerTest
81 : public testing::Test { 81 : public testing::Test {
82 public: 82 public:
83 SessionDataTypeControllerTest() 83 SessionDataTypeControllerTest()
84 : load_finished_(false), 84 : load_finished_(false),
85 thread_bundle_(content::TestBrowserThreadBundle::DEFAULT), 85 thread_bundle_(content::TestBrowserThreadBundle::DEFAULT),
86 weak_ptr_factory_(this), 86 last_type_(syncer::UNSPECIFIED),
87 last_type_(syncer::UNSPECIFIED) {} 87 weak_ptr_factory_(this) {}
88 ~SessionDataTypeControllerTest() override {} 88 ~SessionDataTypeControllerTest() override {}
89 89
90 void SetUp() override { 90 void SetUp() override {
91 synced_window_delegate_.reset(new MockSyncedWindowDelegate(&profile_)); 91 synced_window_delegate_.reset(new MockSyncedWindowDelegate(&profile_));
92 synced_window_getter_.reset(new MockSyncedWindowDelegatesGetter()); 92 synced_window_getter_.reset(new MockSyncedWindowDelegatesGetter());
93 synced_window_getter_->Add(synced_window_delegate_.get()); 93 synced_window_getter_->Add(synced_window_delegate_.get());
94 94
95 local_device_.reset(new LocalDeviceInfoProviderMock( 95 local_device_.reset(new LocalDeviceInfoProviderMock(
96 "cache_guid", 96 "cache_guid",
97 "Wayne Gretzky's Hacking Box", 97 "Wayne Gretzky's Hacking Box",
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 scoped_refptr<SessionDataTypeController> controller_; 155 scoped_refptr<SessionDataTypeController> controller_;
156 scoped_ptr<MockSyncedWindowDelegatesGetter> synced_window_getter_; 156 scoped_ptr<MockSyncedWindowDelegatesGetter> synced_window_getter_;
157 scoped_ptr<LocalDeviceInfoProviderMock> local_device_; 157 scoped_ptr<LocalDeviceInfoProviderMock> local_device_;
158 scoped_ptr<MockSyncedWindowDelegate> synced_window_delegate_; 158 scoped_ptr<MockSyncedWindowDelegate> synced_window_delegate_;
159 bool load_finished_; 159 bool load_finished_;
160 160
161 private: 161 private:
162 content::TestBrowserThreadBundle thread_bundle_; 162 content::TestBrowserThreadBundle thread_bundle_;
163 ProfileSyncComponentsFactoryMock profile_sync_factory_; 163 ProfileSyncComponentsFactoryMock profile_sync_factory_;
164 TestingProfile profile_; 164 TestingProfile profile_;
165 base::WeakPtrFactory<SessionDataTypeControllerTest> weak_ptr_factory_;
166 syncer::ModelType last_type_; 165 syncer::ModelType last_type_;
167 syncer::SyncError last_error_; 166 syncer::SyncError last_error_;
167 base::WeakPtrFactory<SessionDataTypeControllerTest> weak_ptr_factory_;
168 }; 168 };
169 169
170 TEST_F(SessionDataTypeControllerTest, StartModels) { 170 TEST_F(SessionDataTypeControllerTest, StartModels) {
171 Start(); 171 Start();
172 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, 172 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
173 controller_->state()); 173 controller_->state());
174 EXPECT_TRUE(LoadResult()); 174 EXPECT_TRUE(LoadResult());
175 } 175 }
176 176
177 TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByLocalDevice) { 177 TEST_F(SessionDataTypeControllerTest, StartModelsDelayedByLocalDevice) {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 local_device_->SetInitialized(true); 237 local_device_->SetInitialized(true);
238 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED, 238 EXPECT_EQ(sync_driver::DataTypeController::MODEL_LOADED,
239 controller_->state()); 239 controller_->state());
240 EXPECT_TRUE(LoadResult()); 240 EXPECT_TRUE(LoadResult());
241 } 241 }
242 242
243 } // namespace 243 } // namespace
244 244
245 } // namespace browser_sync 245 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/speech/extension_api/tts_extension_apitest.cc ('k') | chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698