chrome/browser/sync/profile_sync_service_session_unittest.cc - Issue 10147003: [Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/

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

Issue 10147003: [Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Win update errors Created 8 years, 8 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

« no previous file with comments | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <map>	5 #include <map>

6 #include <string>	6 #include <string>

7	7

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

9 #include "base/bind_helpers.h"	9 #include "base/bind_helpers.h"

10 #include "base/callback.h"	10 #include "base/callback.h"

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

12 #include "base/location.h"	12 #include "base/location.h"

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

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

15 #include "base/scoped_temp_dir.h"	15 #include "base/scoped_temp_dir.h"

16 #include "base/stl_util.h"	16 #include "base/stl_util.h"

17 #include "base/time.h"	17 #include "base/time.h"

18 #include "chrome/browser/signin/signin_manager.h"	18 #include "chrome/browser/signin/signin_manager.h"

19 #include "chrome/browser/signin/signin_manager_factory.h"	19 #include "chrome/browser/signin/signin_manager_factory.h"

20 #include "chrome/browser/signin/token_service_factory.h"	20 #include "chrome/browser/signin/token_service_factory.h"

21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"	21 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"

22 #include "chrome/browser/sync/glue/session_change_processor.h"	22 #include "chrome/browser/sync/glue/session_change_processor.h"

23 #include "chrome/browser/sync/glue/session_data_type_controller.h"	23 #include "chrome/browser/sync/glue/session_data_type_controller.h"

24 #include "chrome/browser/sync/glue/session_model_associator.h"	24 #include "chrome/browser/sync/glue/session_model_associator.h"

25 #include "chrome/browser/sync/glue/sync_backend_host.h"	25 #include "chrome/browser/sync/glue/sync_backend_host.h"

26 #include "chrome/browser/sync/internal_api/change_record.h"

27 #include "chrome/browser/sync/internal_api/read_node.h"

28 #include "chrome/browser/sync/internal_api/read_transaction.h"

29 #include "chrome/browser/sync/internal_api/write_node.h"

30 #include "chrome/browser/sync/internal_api/write_transaction.h"

31 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"	26 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"

32 #include "chrome/browser/sync/profile_sync_service_factory.h"	27 #include "chrome/browser/sync/profile_sync_service_factory.h"

33 #include "chrome/browser/sync/profile_sync_test_util.h"	28 #include "chrome/browser/sync/profile_sync_test_util.h"

34 #include "chrome/browser/sync/test_profile_sync_service.h"	29 #include "chrome/browser/sync/test_profile_sync_service.h"

35 #include "chrome/common/chrome_notification_types.h"	30 #include "chrome/common/chrome_notification_types.h"

36 #include "chrome/common/net/gaia/gaia_constants.h"	31 #include "chrome/common/net/gaia/gaia_constants.h"

37 #include "chrome/test/base/browser_with_test_window_test.h"	32 #include "chrome/test/base/browser_with_test_window_test.h"

38 #include "chrome/test/base/testing_profile.h"	33 #include "chrome/test/base/testing_profile.h"

39 #include "content/public/browser/navigation_entry.h"	34 #include "content/public/browser/navigation_entry.h"

40 #include "content/public/browser/notification_observer.h"	35 #include "content/public/browser/notification_observer.h"

41 #include "content/public/browser/notification_registrar.h"	36 #include "content/public/browser/notification_registrar.h"

42 #include "content/public/browser/notification_service.h"	37 #include "content/public/browser/notification_service.h"

43 #include "content/test/test_browser_thread.h"	38 #include "content/test/test_browser_thread.h"

44 #include "googleurl/src/gurl.h"	39 #include "googleurl/src/gurl.h"

	40 #include "sync/internal_api/change_record.h"

	41 #include "sync/internal_api/read_node.h"

	42 #include "sync/internal_api/read_transaction.h"

	43 #include "sync/internal_api/write_node.h"

	44 #include "sync/internal_api/write_transaction.h"

45 #include "sync/protocol/session_specifics.pb.h"	45 #include "sync/protocol/session_specifics.pb.h"

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

47 #include "sync/syncable/model_type.h"	47 #include "sync/syncable/model_type.h"

48 #include "sync/syncable/syncable.h"	48 #include "sync/syncable/syncable.h"

49 #include "sync/test/engine/test_id_factory.h"	49 #include "sync/test/engine/test_id_factory.h"

50 #include "testing/gmock/include/gmock/gmock.h"	50 #include "testing/gmock/include/gmock/gmock.h"

51 #include "testing/gtest/include/gtest/gtest.h"	51 #include "testing/gtest/include/gtest/gtest.h"

52 #include "ui/base/ui_base_types.h"	52 #include "ui/base/ui_base_types.h"

53	53

54 using browser_sync::SessionChangeProcessor;	54 using browser_sync::SessionChangeProcessor;

(...skipping 1070 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1125 error = model_associator_->AssociateModels();	1125 error = model_associator_->AssociateModels();

1126 ASSERT_FALSE(error.IsSet());	1126 ASSERT_FALSE(error.IsSet());

1127	1127

1128 // Add some more tabs to ensure we don't conflict with the pre-existing tab	1128 // Add some more tabs to ensure we don't conflict with the pre-existing tab

1129 // node.	1129 // node.

1130 AddTab(browser(), GURL("http://baz1"));	1130 AddTab(browser(), GURL("http://baz1"));

1131 AddTab(browser(), GURL("http://baz2"));	1131 AddTab(browser(), GURL("http://baz2"));

1132 }	1132 }

1133	1133

1134 } // namespace browser_sync	1134 } // namespace browser_sync

OLD	NEW