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

Side by Side Diff: chrome/browser/sync/test/integration/sync_app_helper.cc

Issue 9977021: Add ExtensionSytem::Get(Profile*) as a wrapper around (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
OLDNEW
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_system_factory.h"
10 #include "chrome/browser/extensions/extension_sorting.h" 9 #include "chrome/browser/extensions/extension_sorting.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/sync/test/integration/extensions_helper.h" 11 #include "chrome/browser/sync/test/integration/extensions_helper.h"
13 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 12 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
14 #include "chrome/browser/sync/test/integration/sync_extension_helper.h" 13 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
15 #include "chrome/common/string_ordinal.h" 14 #include "chrome/common/string_ordinal.h"
16 15
17 namespace { 16 namespace {
18 17
19 struct AppState { 18 struct AppState {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 SyncAppHelper* instance = Singleton<SyncAppHelper>::get(); 86 SyncAppHelper* instance = Singleton<SyncAppHelper>::get();
88 instance->SetupIfNecessary(sync_datatype_helper::test()); 87 instance->SetupIfNecessary(sync_datatype_helper::test());
89 return instance; 88 return instance;
90 } 89 }
91 90
92 void SyncAppHelper::SetupIfNecessary(SyncTest* test) { 91 void SyncAppHelper::SetupIfNecessary(SyncTest* test) {
93 if (setup_completed_) 92 if (setup_completed_)
94 return; 93 return;
95 94
96 for (int i = 0; i < test->num_clients(); ++i) { 95 for (int i = 0; i < test->num_clients(); ++i) {
97 ExtensionSystemFactory::GetForProfile(test->GetProfile(i))->Init(true); 96 ExtensionSystem::Get(test->GetProfile(i))->Init(true);
98 } 97 }
99 ExtensionSystemFactory::GetForProfile(test->verifier())->Init(true); 98 ExtensionSystem::Get(test->verifier())->Init(true);
100 99
101 setup_completed_ = true; 100 setup_completed_ = true;
102 } 101 }
103 102
104 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) { 103 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) {
105 if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch( 104 if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch(
106 profile1, profile2)) 105 profile1, profile2))
107 return false; 106 return false;
108 107
109 const AppStateMap& state_map1 = GetAppStates(profile1); 108 const AppStateMap& state_map1 = GetAppStates(profile1);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 171 }
173 172
174 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { 173 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
175 profile->GetExtensionService()->extension_prefs()->extension_sorting()-> 174 profile->GetExtensionService()->extension_prefs()->extension_sorting()->
176 FixNTPOrdinalCollisions(); 175 FixNTPOrdinalCollisions();
177 } 176 }
178 177
179 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} 178 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
180 179
181 SyncAppHelper::~SyncAppHelper() {} 180 SyncAppHelper::~SyncAppHelper() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698