Post-cleanup settings reset.

chrome/browser/ui/startup/startup_browser_creator.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/ui/startup/startup_browser_creator.h"
 
 #include <stddef.h>
 
 #include <algorithm>  // For max().
 #include <limits>
@@ skipping 87 matching lines @@
 #include "ui/events/devices/x11/touch_factory_x11.h"  // nogncheck
 #endif
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/web_applications/web_app_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "chrome/browser/metrics/jumplist_metrics_win.h"
+#include "chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h"
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/printing/print_dialog_cloud.h"
 #endif
 
 #if BUILDFLAG(ENABLE_APP_LIST)
 #include "chrome/browser/ui/app_list/app_list_service.h"
@@ skipping 257 matching lines @@
     if (!launched) {
       LOG(ERROR) << "launch error";
       return false;
     }
   } else {
     in_synchronous_profile_launch_ = false;
   }
 
   profile_launch_observer.Get().AddLaunched(profile);
 
+#if defined(OS_WIN)
+// Reset settings for the current profile if it's tagged to be reset after a
+// complete run of the Chrome Cleanup tool.
+// safe_browsing::ResetPostCleanupSettingsIfTagged(
+//     {profile}, base::Bind([] {}), nullptr /* use default delegate */);

[alito, 2017/06/02 05:32:42]

Is this supposed to be uncommented or removed?

[ftirelo, 2017/06/02 21:20:57]

Commented this while debugging the flaky browser test, but forgot to add back.

+#endif
+
 #if defined(OS_CHROMEOS)
   chromeos::ProfileHelper::Get()->ProfileStartup(profile, process_startup);
 #endif
   return true;
 }
 
 // static
 bool StartupBrowserCreator::WasRestarted() {
   // Stores the value of the preference kWasRestarted had when it was read.
   static bool was_restarted = false;
@@ skipping 622 matching lines @@
     if (!entry->IsSigninRequired()) {
       Profile* profile = profile_manager->GetProfile(entry->GetPath());
       if (profile)
         return profile;
     }
   }
 
   return nullptr;
 }
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)