Revert "Eliminate all code related to the AutomaticProfileResetter."

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 264 matching lines @@
                                     bool incognito_pref_store) {
 #if defined(ENABLE_EXTENSIONS)
   return new ExtensionPrefStore(
       ExtensionPrefValueMapFactory::GetForBrowserContext(profile),
       incognito_pref_store);
 #else
   return NULL;
 #endif
 }
 
-#if !defined(OS_ANDROID)
-// Deletes the file that was used by the AutomaticProfileResetter service, which
-// has since been removed, to store that the prompt had already been shown.
-// TODO(engedy): Remove this and caller in M42 or later. See crbug.com/398813.
-void DeleteResetPromptMementoFile(const base::FilePath& profile_dir) {
-  base::FilePath memento_path =
-      profile_dir.Append(FILE_PATH_LITERAL("Reset Prompt Memento"));
-  base::DeleteFile(memento_path, false);
-}
-#endif
-
 }  // namespace
 
 // static
 Profile* Profile::CreateProfile(const base::FilePath& path,
                                 Delegate* delegate,
                                 CreateMode create_mode) {
   TRACE_EVENT_BEGIN1("browser",
                      "Profile::CreateProfile",
                      "profile_path",
                      path.value().c_str());
@@ skipping 411 matching lines @@
         base::TimeDelta::FromMilliseconds(create_readme_delay_ms));
 
   TRACE_EVENT0("browser", "ProfileImpl::SetSaveSessionStorageOnDisk");
   content::BrowserContext::GetDefaultStoragePartition(this)->
       GetDOMStorageContext()->SetSaveSessionStorageOnDisk();
 
   // The DomDistillerViewerSource is not a normal WebUI so it must be registered
   // as a URLDataSource early.
   RegisterDomDistillerViewerSource(this);
 
-#if !defined(OS_ANDROID)
-  BrowserThread::GetBlockingPool()->PostDelayedWorkerTask(
-      FROM_HERE,
-      base::Bind(&DeleteResetPromptMementoFile, GetPath()),
-      base::TimeDelta::FromMilliseconds(2 * create_readme_delay_ms));
-#endif
-
   // Creation has been finished.
   TRACE_EVENT_END1("browser",
                    "Profile::CreateProfile",
                    "profile_path",
                    path_.value().c_str());
 
 #if defined(OS_CHROMEOS)
   if (chromeos::LoginUtils::Get()->RestartToApplyPerSessionFlagsIfNeed(this,
                                                                        true)) {
     return;
@@ skipping 708 matching lines @@
       domain_reliability::DomainReliabilityServiceFactory::GetInstance()->
           GetForBrowserContext(this);
   if (!service)
     return scoped_ptr<domain_reliability::DomainReliabilityMonitor>();
 
   return service->CreateMonitor(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
       local_state,
       prefs::kMetricsReportingEnabled);
 }