chrome/browser/sync/backend_migrator_unittest.cc - Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/sync/backend_migrator_unittest.cc

Issue 10534080: sync: move internal_api components used by chrome/browser into internal_api/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix test Created 8 years, 6 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 "chrome/browser/sync/backend_migrator.h"	5 #include "chrome/browser/sync/backend_migrator.h"

6	6

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

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

9 #include "chrome/browser/sync/glue/data_type_manager_mock.h"	9 #include "chrome/browser/sync/glue/data_type_manager_mock.h"

10 #include "chrome/browser/sync/profile_sync_service_mock.h"	10 #include "chrome/browser/sync/profile_sync_service_mock.h"

11 #include "chrome/common/chrome_notification_types.h"	11 #include "chrome/common/chrome_notification_types.h"

12 #include "sync/internal_api/public/syncable/model_type_test_util.h"	12 #include "sync/internal_api/public/syncable/model_type_test_util.h"

13 #include "sync/internal_api/test_user_share.h"	13 #include "sync/internal_api/public/test/test_user_share.h"

14 #include "sync/internal_api/write_transaction.h"	14 #include "sync/internal_api/public/write_transaction.h"

15 #include "sync/protocol/sync.pb.h"	15 #include "sync/protocol/sync.pb.h"

	16 #include "sync/syncable/syncable.h" // TODO(tim): Remove. Bug 131130.

16 #include "testing/gmock/include/gmock/gmock.h"	17 #include "testing/gmock/include/gmock/gmock.h"

17 #include "testing/gtest/include/gtest/gtest.h"	18 #include "testing/gtest/include/gtest/gtest.h"

18	19

19 using ::testing::_;	20 using ::testing::_;

20 using ::testing::Eq;	21 using ::testing::Eq;

21 using ::testing::Mock;	22 using ::testing::Mock;

22 using ::testing::NiceMock;	23 using ::testing::NiceMock;

23 using ::testing::Return;	24 using ::testing::Return;

24	25

25 namespace browser_sync {	26 namespace browser_sync {

(...skipping 288 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
314 .WillOnce(Return(DataTypeManager::CONFIGURED));	315 .WillOnce(Return(DataTypeManager::CONFIGURED));

315 EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION))	316 EXPECT_CALL(*manager(), Configure(_, sync_api::CONFIGURE_REASON_MIGRATION))

316 .Times(1);	317 .Times(1);

317 migrator()->MigrateTypes(to_migrate);	318 migrator()->MigrateTypes(to_migrate);

318 SetUnsyncedTypes(syncable::ModelTypeSet());	319 SetUnsyncedTypes(syncable::ModelTypeSet());

319 SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet());	320 SendConfigureDone(DataTypeManager::ABORTED, syncable::ModelTypeSet());

320 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());	321 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());

321 }	322 }

322	323

323 }; // namespace browser_sync	324 }; // namespace browser_sync

OLD	NEW

« no previous file with comments | « chrome/browser/sync/backend_migrator.cc ('k') | chrome/browser/sync/backend_unrecoverable_error_handler.h » ('j') | no next file with comments »