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

Side by Side Diff: chrome/browser/sync/profile_sync_service_session_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

« 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"

(...skipping 19 matching lines...) Expand all Loading...
30 #include "chrome/common/chrome_notification_types.h"	30 #include "chrome/common/chrome_notification_types.h"

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

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

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

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

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

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

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

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

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

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

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

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

41 #include "sync/internal_api/public/syncable/model_type.h"	43 #include "sync/internal_api/public/syncable/model_type.h"

42 #include "sync/internal_api/read_node.h"	44 #include "sync/internal_api/public/write_node.h"

43 #include "sync/internal_api/read_transaction.h"	45 #include "sync/internal_api/public/write_transaction.h"

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

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

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

47 #include "sync/protocol/sync.pb.h"	47 #include "sync/protocol/sync.pb.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;

55 using browser_sync::SessionDataTypeController;	55 using browser_sync::SessionDataTypeController;

(...skipping 1140 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1196 sync_pb::SessionSpecifics specifics;	1196 sync_pb::SessionSpecifics specifics;

1197 header.SetSessionSpecifics(specifics);	1197 header.SetSessionSpecifics(specifics);

1198 }	1198 }

1199 // Ensure we associate properly despite the pre-existing node with our local	1199 // Ensure we associate properly despite the pre-existing node with our local

1200 // tag.	1200 // tag.

1201 error = model_associator_->AssociateModels();	1201 error = model_associator_->AssociateModels();

1202 ASSERT_FALSE(error.IsSet());	1202 ASSERT_FALSE(error.IsSet());

1203 }	1203 }

1204	1204

1205 } // namespace browser_sync	1205 } // namespace browser_sync

OLD	NEW