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/test/integration/sync_app_helper.h" | 5 #include "chrome/browser/sync/test/integration/sync_app_helper.h" |
6 | 6 |
7 #include "chrome/browser/extensions/extension_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
8 #include "chrome/browser/extensions/extension_system.h" | 8 #include "chrome/browser/extensions/extension_system.h" |
9 #include "chrome/browser/extensions/extension_sorting.h" | 9 #include "chrome/browser/extensions/extension_sorting.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 SyncAppHelper* instance = Singleton<SyncAppHelper>::get(); | 86 SyncAppHelper* instance = Singleton<SyncAppHelper>::get(); |
87 instance->SetupIfNecessary(sync_datatype_helper::test()); | 87 instance->SetupIfNecessary(sync_datatype_helper::test()); |
88 return instance; | 88 return instance; |
89 } | 89 } |
90 | 90 |
91 void SyncAppHelper::SetupIfNecessary(SyncTest* test) { | 91 void SyncAppHelper::SetupIfNecessary(SyncTest* test) { |
92 if (setup_completed_) | 92 if (setup_completed_) |
93 return; | 93 return; |
94 | 94 |
95 for (int i = 0; i < test->num_clients(); ++i) { | 95 for (int i = 0; i < test->num_clients(); ++i) { |
96 extensions::ExtensionSystem::Get(test->GetProfile(i))->Init(true); | 96 extensions::ExtensionSystem::Get( |
| 97 test->GetProfile(i))->InitForRegularProfile(true); |
97 } | 98 } |
98 extensions::ExtensionSystem::Get(test->verifier())->Init(true); | 99 extensions::ExtensionSystem::Get( |
| 100 test->verifier())->InitForRegularProfile(true); |
99 | 101 |
100 setup_completed_ = true; | 102 setup_completed_ = true; |
101 } | 103 } |
102 | 104 |
103 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) { | 105 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) { |
104 if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch( | 106 if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch( |
105 profile1, profile2)) | 107 profile1, profile2)) |
106 return false; | 108 return false; |
107 | 109 |
108 const AppStateMap& state_map1 = GetAppStates(profile1); | 110 const AppStateMap& state_map1 = GetAppStates(profile1); |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 } | 173 } |
172 | 174 |
173 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { | 175 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { |
174 profile->GetExtensionService()->extension_prefs()->extension_sorting()-> | 176 profile->GetExtensionService()->extension_prefs()->extension_sorting()-> |
175 FixNTPOrdinalCollisions(); | 177 FixNTPOrdinalCollisions(); |
176 } | 178 } |
177 | 179 |
178 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} | 180 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} |
179 | 181 |
180 SyncAppHelper::~SyncAppHelper() {} | 182 SyncAppHelper::~SyncAppHelper() {} |
OLD | NEW |