MD Settings: Second try at fixing ResetSettingsHandler crash

chrome/browser/ui/webui/settings/reset_settings_handler.cc

 // Copyright 2013 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/webui/settings/reset_settings_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 127 matching lines @@
   bool send_settings = false;
   CHECK(args->GetBoolean(1, &send_settings));
   std::string request_origin_string;
   CHECK(args->GetString(2, &request_origin_string));
   reset_report::ChromeResetReport::ResetRequestOrigin request_origin =
       ResetRequestOriginFromString(request_origin_string);
 
   DCHECK(brandcode_.empty() || config_fetcher_);
   if (config_fetcher_ && config_fetcher_->IsActive()) {
     // Reset once the prefs are fetched.
-    config_fetcher_->SetCallback(base::Bind(
-        &ResetSettingsHandler::ResetProfile, weak_ptr_factory_.GetWeakPtr(),
-        callback_id, send_settings, request_origin));
+    config_fetcher_->SetCallback(base::Bind(&ResetSettingsHandler::ResetProfile,
+                                            base::Unretained(this), callback_id,
+                                            send_settings, request_origin));
   } else {
     ResetProfile(callback_id, send_settings, request_origin);
   }
 }
 
 void ResetSettingsHandler::OnResetProfileSettingsDone(
     std::string callback_id,
     bool send_feedback,
     reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
   ResolveJavascriptCallback(base::Value(callback_id),
@@ skipping 68 matching lines @@
 
 void ResetSettingsHandler::ResetProfile(
     const std::string& callback_id,
     bool send_settings,
     reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
   DCHECK(!GetResetter()->IsActive());
 
   std::unique_ptr<BrandcodedDefaultSettings> default_settings;
   if (config_fetcher_) {
     DCHECK(!config_fetcher_->IsActive());
     default_settings = config_fetcher_->GetSettings();

[dschuyler, 2017/03/31 19:21:39]

Can |config_fetcher_| be true (at line 237) with the new calls to
base::ResetAndReturn()? If it will now always be false, are we losing the
default_settings from the |config_fetcher_| here? 

[tommycli, 2017/04/03 15:34:23]

Hi, yes, that will remain true. The base::ResetAndReturn call is within
config_fetcher_ and resets a member of config_fetcher_, not config_fetcher_
itself.

[dschuyler, 2017/04/03 18:27:09]

Cool. Yeah, that makes sense.

     config_fetcher_.reset();
   } else {
     DCHECK(brandcode_.empty());
   }
 
   // If failed to fetch BrandcodedDefaultSettings or this is an organic
   // installation, use default settings.
   if (!default_settings)
     default_settings.reset(new BrandcodedDefaultSettings);
 
@@ skipping 52 matching lines @@
 void ResetSettingsHandler::OnShowPowerwashDialog(
      const base::ListValue* args) {
   UMA_HISTOGRAM_ENUMERATION(
       "Reset.ChromeOS.PowerwashDialogShown",
       chromeos::reset::DIALOG_FROM_OPTIONS,
       chromeos::reset::DIALOG_VIEW_TYPE_SIZE);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace settings