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

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

Issue 398423002: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed wrong signin_scoped_device_id assert from LocalDeviceInfoProvider. Created 6 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
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 "chrome/browser/sync/sessions/sessions_sync_manager.h" 5 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/sessions/session_id.h" 9 #include "chrome/browser/sessions/session_id.h"
10 #include "chrome/browser/sessions/session_tab_helper.h" 10 #include "chrome/browser/sessions/session_tab_helper.h"
11 #include "chrome/browser/sessions/session_types.h" 11 #include "chrome/browser/sessions/session_types.h"
12 #include "chrome/browser/sync/glue/device_info.h" 12 #include "chrome/browser/sync/glue/device_info.h"
13 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
13 #include "chrome/browser/sync/glue/session_sync_test_helper.h" 14 #include "chrome/browser/sync/glue/session_sync_test_helper.h"
14 #include "chrome/browser/sync/glue/synced_tab_delegate.h" 15 #include "chrome/browser/sync/glue/synced_tab_delegate.h"
15 #include "chrome/browser/sync/glue/synced_window_delegate.h" 16 #include "chrome/browser/sync/glue/synced_window_delegate.h"
16 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 17 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
17 #include "chrome/browser/sync/sessions/sessions_util.h" 18 #include "chrome/browser/sync/sessions/sessions_util.h"
18 #include "chrome/browser/sync/sessions/synced_window_delegates_getter.h" 19 #include "chrome/browser/sync/sessions/synced_window_delegates_getter.h"
19 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" 20 #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/test/base/browser_with_test_window_test.h" 22 #include "chrome/test/base/browser_with_test_window_test.h"
22 #include "components/sessions/serialized_navigation_entry_test_helper.h" 23 #include "components/sessions/serialized_navigation_entry_test_helper.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 virtual void Stop() OVERRIDE {} 222 virtual void Stop() OVERRIDE {}
222 }; 223 };
223 224
224 scoped_ptr<LocalSessionEventRouter> NewDummyRouter() { 225 scoped_ptr<LocalSessionEventRouter> NewDummyRouter() {
225 return scoped_ptr<LocalSessionEventRouter>(new DummyRouter()); 226 return scoped_ptr<LocalSessionEventRouter>(new DummyRouter());
226 } 227 }
227 228
228 } // namespace 229 } // namespace
229 230
230 class SessionsSyncManagerTest 231 class SessionsSyncManagerTest
231 : public BrowserWithTestWindowTest, 232 : public BrowserWithTestWindowTest {
232 public SessionsSyncManager::SyncInternalApiDelegate {
233 public: 233 public:
234 SessionsSyncManagerTest() : test_processor_(NULL) {} 234 SessionsSyncManagerTest()
235 : test_processor_(NULL) {
236 local_device_.reset(new LocalDeviceInfoProviderMock(
237 "cache_guid",
238 "Wayne Gretzky's Hacking Box",
239 "Chromium 10k",
240 "Chrome 10k",
241 sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
242 "device_id"));
243 }
235 244
236 virtual void SetUp() OVERRIDE { 245 virtual void SetUp() OVERRIDE {
237 BrowserWithTestWindowTest::SetUp(); 246 BrowserWithTestWindowTest::SetUp();
238 browser_sync::NotificationServiceSessionsRouter* router( 247 browser_sync::NotificationServiceSessionsRouter* router(
239 new browser_sync::NotificationServiceSessionsRouter( 248 new browser_sync::NotificationServiceSessionsRouter(
240 profile(), syncer::SyncableService::StartSyncFlare())); 249 profile(), syncer::SyncableService::StartSyncFlare()));
241 manager_.reset(new SessionsSyncManager(profile(), this, 250 manager_.reset(new SessionsSyncManager(profile(), local_device_.get(),
242 scoped_ptr<LocalSessionEventRouter>(router))); 251 scoped_ptr<LocalSessionEventRouter>(router)));
243 } 252 }
244 253
245 virtual void TearDown() OVERRIDE { 254 virtual void TearDown() OVERRIDE {
246 test_processor_ = NULL; 255 test_processor_ = NULL;
247 helper()->Reset(); 256 helper()->Reset();
248 manager_.reset(); 257 manager_.reset();
249 BrowserWithTestWindowTest::TearDown(); 258 BrowserWithTestWindowTest::TearDown();
250 } 259 }
251 260
252 virtual scoped_ptr<DeviceInfo> GetLocalDeviceInfo() const OVERRIDE { 261 const DeviceInfo* GetLocalDeviceInfo() {
253 return scoped_ptr<DeviceInfo>( 262 return local_device_->GetLocalDeviceInfo();
254 new DeviceInfo(GetLocalSyncCacheGUID(),
255 "Wayne Gretzky's Hacking Box",
256 "Chromium 10k",
257 "Chrome 10k",
258 sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
259 "device_id"));
260 }
261
262 virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
263 return "cache_guid";
264 } 263 }
265 264
266 SessionsSyncManager* manager() { return manager_.get(); } 265 SessionsSyncManager* manager() { return manager_.get(); }
267 SessionSyncTestHelper* helper() { return &helper_; } 266 SessionSyncTestHelper* helper() { return &helper_; }
267 LocalDeviceInfoProvider* local_device() { return local_device_.get(); }
268 268
269 void InitWithSyncDataTakeOutput(const syncer::SyncDataList& initial_data, 269 void InitWithSyncDataTakeOutput(const syncer::SyncDataList& initial_data,
270 syncer::SyncChangeList* output) { 270 syncer::SyncChangeList* output) {
271 test_processor_ = new TestSyncProcessorStub(output); 271 test_processor_ = new TestSyncProcessorStub(output);
272 syncer::SyncMergeResult result = manager_->MergeDataAndStartSyncing( 272 syncer::SyncMergeResult result = manager_->MergeDataAndStartSyncing(
273 syncer::SESSIONS, initial_data, 273 syncer::SESSIONS, initial_data,
274 scoped_ptr<syncer::SyncChangeProcessor>(test_processor_), 274 scoped_ptr<syncer::SyncChangeProcessor>(test_processor_),
275 scoped_ptr<syncer::SyncErrorFactory>( 275 scoped_ptr<syncer::SyncErrorFactory>(
276 new syncer::SyncErrorFactoryMock())); 276 new syncer::SyncErrorFactoryMock()));
277 EXPECT_FALSE(result.error().IsSet()); 277 EXPECT_FALSE(result.error().IsSet());
(...skipping 29 matching lines...) Expand all
307 } 307 }
308 } 308 }
309 EXPECT_TRUE(found); 309 EXPECT_TRUE(found);
310 return list; 310 return list;
311 } 311 }
312 312
313 private: 313 private:
314 scoped_ptr<SessionsSyncManager> manager_; 314 scoped_ptr<SessionsSyncManager> manager_;
315 SessionSyncTestHelper helper_; 315 SessionSyncTestHelper helper_;
316 TestSyncProcessorStub* test_processor_; 316 TestSyncProcessorStub* test_processor_;
317 scoped_ptr<LocalDeviceInfoProviderMock> local_device_;
317 }; 318 };
318 319
319 // Test that the SyncSessionManager can properly fill in a SessionHeader. 320 // Test that the SyncSessionManager can properly fill in a SessionHeader.
320 TEST_F(SessionsSyncManagerTest, PopulateSessionHeader) { 321 TEST_F(SessionsSyncManagerTest, PopulateSessionHeader) {
321 sync_pb::SessionHeader header_s; 322 sync_pb::SessionHeader header_s;
322 header_s.set_client_name("Client 1"); 323 header_s.set_client_name("Client 1");
323 header_s.set_device_type(sync_pb::SyncEnums_DeviceType_TYPE_WIN); 324 header_s.set_device_type(sync_pb::SyncEnums_DeviceType_TYPE_WIN);
324 325
325 SyncedSession session; 326 SyncedSession session;
326 base::Time time = base::Time::Now(); 327 base::Time time = base::Time::Now();
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 680
680 // Now take that header node and feed it in as input. 681 // Now take that header node and feed it in as input.
681 SyncData d(SyncData::CreateRemoteData( 682 SyncData d(SyncData::CreateRemoteData(
682 1, 683 1,
683 data.GetSpecifics(), 684 data.GetSpecifics(),
684 base::Time(), 685 base::Time(),
685 syncer::AttachmentIdList(), 686 syncer::AttachmentIdList(),
686 syncer::AttachmentServiceProxyForTest::Create())); 687 syncer::AttachmentServiceProxyForTest::Create()));
687 syncer::SyncDataList in(&d, &d + 1); 688 syncer::SyncDataList in(&d, &d + 1);
688 out.clear(); 689 out.clear();
689 SessionsSyncManager manager2(profile(), this, NewDummyRouter()); 690 SessionsSyncManager manager2(profile(), local_device(), NewDummyRouter());
690 syncer::SyncMergeResult result = manager2.MergeDataAndStartSyncing( 691 syncer::SyncMergeResult result = manager2.MergeDataAndStartSyncing(
691 syncer::SESSIONS, in, 692 syncer::SESSIONS, in,
692 scoped_ptr<syncer::SyncChangeProcessor>( 693 scoped_ptr<syncer::SyncChangeProcessor>(
693 new TestSyncProcessorStub(&out)), 694 new TestSyncProcessorStub(&out)),
694 scoped_ptr<syncer::SyncErrorFactory>( 695 scoped_ptr<syncer::SyncErrorFactory>(
695 new syncer::SyncErrorFactoryMock())); 696 new syncer::SyncErrorFactoryMock()));
696 ASSERT_FALSE(result.error().IsSet()); 697 ASSERT_FALSE(result.error().IsSet());
697 698
698 EXPECT_EQ(1U, out.size()); 699 EXPECT_EQ(1U, out.size());
699 EXPECT_EQ(SyncChange::ACTION_UPDATE, out[0].change_type()); 700 EXPECT_EQ(SyncChange::ACTION_UPDATE, out[0].change_type());
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 sync_pb::EntitySpecifics entity(changes[0].sync_data().GetSpecifics()); 1268 sync_pb::EntitySpecifics entity(changes[0].sync_data().GetSpecifics());
1268 entity.mutable_session()->mutable_tab()->set_tab_id(1); 1269 entity.mutable_session()->mutable_tab()->set_tab_id(1);
1269 SyncData d(SyncData::CreateRemoteData( 1270 SyncData d(SyncData::CreateRemoteData(
1270 1, 1271 1,
1271 entity, 1272 entity,
1272 base::Time(), 1273 base::Time(),
1273 syncer::AttachmentIdList(), 1274 syncer::AttachmentIdList(),
1274 syncer::AttachmentServiceProxyForTest::Create())); 1275 syncer::AttachmentServiceProxyForTest::Create()));
1275 syncer::SyncDataList in(&d, &d + 1); 1276 syncer::SyncDataList in(&d, &d + 1);
1276 changes.clear(); 1277 changes.clear();
1277 SessionsSyncManager manager2(profile(), this, NewDummyRouter()); 1278 SessionsSyncManager manager2(profile(), local_device(), NewDummyRouter());
1278 syncer::SyncMergeResult result = manager2.MergeDataAndStartSyncing( 1279 syncer::SyncMergeResult result = manager2.MergeDataAndStartSyncing(
1279 syncer::SESSIONS, in, 1280 syncer::SESSIONS, in,
1280 scoped_ptr<syncer::SyncChangeProcessor>( 1281 scoped_ptr<syncer::SyncChangeProcessor>(
1281 new TestSyncProcessorStub(&changes)), 1282 new TestSyncProcessorStub(&changes)),
1282 scoped_ptr<syncer::SyncErrorFactory>( 1283 scoped_ptr<syncer::SyncErrorFactory>(
1283 new syncer::SyncErrorFactoryMock())); 1284 new syncer::SyncErrorFactoryMock()));
1284 ASSERT_FALSE(result.error().IsSet()); 1285 ASSERT_FALSE(result.error().IsSet());
1285 EXPECT_TRUE(FilterOutLocalHeaderChanges(&changes)->empty()); 1286 EXPECT_TRUE(FilterOutLocalHeaderChanges(&changes)->empty());
1286 } 1287 }
1287 1288
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
1814 ASSERT_FALSE(observer.notified_of_refresh()); 1815 ASSERT_FALSE(observer.notified_of_refresh());
1815 InitWithNoSyncData(); 1816 InitWithNoSyncData();
1816 AddTab(browser(), GURL("http://foo1")); 1817 AddTab(browser(), GURL("http://foo1"));
1817 EXPECT_FALSE(observer.notified_of_refresh()); 1818 EXPECT_FALSE(observer.notified_of_refresh());
1818 NavigateAndCommitActiveTab(GURL("chrome://newtab/#open_tabs")); 1819 NavigateAndCommitActiveTab(GURL("chrome://newtab/#open_tabs"));
1819 EXPECT_TRUE(observer.notified_of_refresh()); 1820 EXPECT_TRUE(observer.notified_of_refresh());
1820 } 1821 }
1821 #endif // defined(OS_ANDROID) || defined(OS_IOS) 1822 #endif // defined(OS_ANDROID) || defined(OS_IOS)
1822 1823
1823 } // namespace browser_sync 1824 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/sessions/sessions_sync_manager.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698