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

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

Issue 10626007: Move ExtensionSystem into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Master merge; moved class declaration Created 8 years, 5 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
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_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
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 ExtensionSystem::Get(test->GetProfile(i))->Init(true); 96 extensions::ExtensionSystem::Get(test->GetProfile(i))->Init(true);
97 } 97 }
98 ExtensionSystem::Get(test->verifier())->Init(true); 98 extensions::ExtensionSystem::Get(test->verifier())->Init(true);
99 99
100 setup_completed_ = true; 100 setup_completed_ = true;
101 } 101 }
102 102
103 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) { 103 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) {
104 if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch( 104 if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch(
105 profile1, profile2)) 105 profile1, profile2))
106 return false; 106 return false;
107 107
108 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
171 } 171 }
172 172
173 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) { 173 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
174 profile->GetExtensionService()->extension_prefs()->extension_sorting()-> 174 profile->GetExtensionService()->extension_prefs()->extension_sorting()->
175 FixNTPOrdinalCollisions(); 175 FixNTPOrdinalCollisions();
176 } 176 }
177 177
178 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {} 178 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
179 179
180 SyncAppHelper::~SyncAppHelper() {} 180 SyncAppHelper::~SyncAppHelper() {}
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_factory.cc ('k') | chrome/browser/sync/test/integration/sync_extension_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698