Index: chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc |
diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc b/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc |
similarity index 53% |
copy from chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc |
copy to chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc |
index 9c53bd2bd83b5d3615606f50509d805471b68075..98446b51af9982a5a1cdab85cf57dd01e9f962f5 100644 |
--- a/chrome/browser/profile_resetter/automatic_profile_resetter_factory.cc |
+++ b/chrome/browser/profile_resetter/triggered_profile_resetter_factory.cc |
@@ -2,11 +2,11 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
+#include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" |
#include "base/memory/singleton.h" |
#include "base/prefs/pref_registry_simple.h" |
-#include "chrome/browser/profile_resetter/automatic_profile_resetter.h" |
+#include "chrome/browser/profile_resetter/triggered_profile_resetter.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/search_engines/template_url_service_factory.h" |
#include "chrome/browser/ui/global_error/global_error_service_factory.h" |
@@ -16,55 +16,60 @@ |
#include "content/public/browser/browser_context.h" |
// static |
-AutomaticProfileResetter* AutomaticProfileResetterFactory::GetForBrowserContext( |
+TriggeredProfileResetter* TriggeredProfileResetterFactory::GetForBrowserContext( |
content::BrowserContext* context) { |
- return static_cast<AutomaticProfileResetter*>( |
+ return static_cast<TriggeredProfileResetter*>( |
GetInstance()->GetServiceForBrowserContext(context, true)); |
} |
// static |
-AutomaticProfileResetterFactory* |
-AutomaticProfileResetterFactory::GetInstance() { |
- return Singleton<AutomaticProfileResetterFactory>::get(); |
+TriggeredProfileResetterFactory* |
+TriggeredProfileResetterFactory::GetInstance() { |
+ return Singleton<TriggeredProfileResetterFactory>::get(); |
grt (UTC plus 2)
2015/09/04 18:35:48
do you really need Singleton here? if GetInstance
robertshield
2015/09/04 20:27:18
https://code.google.com/p/chromium/codesearch#chro
|
} |
// static |
-void AutomaticProfileResetterFactory::RegisterPrefs( |
+void TriggeredProfileResetterFactory::RegisterPrefs( |
PrefRegistrySimple* registry) { |
registry->RegisterDictionaryPref( |
prefs::kProfileResetPromptMementosInLocalState); |
grt (UTC plus 2)
2015/09/04 18:35:48
was this accidentally copy-n-pasted from Automatic
robertshield
2015/09/04 20:27:18
ugh, yes. cleaned up.
|
} |
-AutomaticProfileResetterFactory::AutomaticProfileResetterFactory() |
+// static |
+void TriggeredProfileResetterFactory::SetGlobalTestingFactory( |
+ TestingFactoryFunction testing_factory) { |
+ GetInstance()->testing_factory_function_ = testing_factory; |
+} |
+ |
+TriggeredProfileResetterFactory::TriggeredProfileResetterFactory() |
: BrowserContextKeyedServiceFactory( |
- "AutomaticProfileResetter", |
+ "TriggeredProfileResetter", |
BrowserContextDependencyManager::GetInstance()) { |
DependsOn(TemplateURLServiceFactory::GetInstance()); |
DependsOn(GlobalErrorServiceFactory::GetInstance()); |
grt (UTC plus 2)
2015/09/04 18:35:48
another copy-n-paste for these two?
robertshield
2015/09/04 20:27:18
ditto.
|
} |
-AutomaticProfileResetterFactory::~AutomaticProfileResetterFactory() {} |
+TriggeredProfileResetterFactory::~TriggeredProfileResetterFactory() {} |
-KeyedService* AutomaticProfileResetterFactory::BuildServiceInstanceFor( |
+KeyedService* TriggeredProfileResetterFactory::BuildServiceInstanceFor( |
content::BrowserContext* context) const { |
+ if (testing_factory_function_) |
+ return testing_factory_function_(context).release(); |
+ |
Profile* profile = Profile::FromBrowserContext(context); |
- AutomaticProfileResetter* service = new AutomaticProfileResetter(profile); |
- service->Initialize(); |
+ TriggeredProfileResetter* service = new TriggeredProfileResetter(profile); |
service->Activate(); |
return service; |
} |
-void AutomaticProfileResetterFactory::RegisterProfilePrefs( |
+void TriggeredProfileResetterFactory::RegisterProfilePrefs( |
user_prefs::PrefRegistrySyncable* registry) { |
- registry->RegisterStringPref(prefs::kProfileResetPromptMementoInProfilePrefs, |
- ""); |
-} |
- |
-bool AutomaticProfileResetterFactory:: |
- ServiceIsCreatedWithBrowserContext() const { |
- return true; |
+#if defined(OS_WIN) |
+ registry->RegisterInt64Pref(prefs::kLastProfileResetTimestamp, 0L); |
+#endif |
} |
-bool AutomaticProfileResetterFactory::ServiceIsNULLWhileTesting() const { |
+bool TriggeredProfileResetterFactory::ServiceIsCreatedWithBrowserContext() |
+ const { |
return true; |
} |