MD Settings: Clear Browsing Data dialog, dismiss when clearing is done.

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

 // Copyright 2015 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/settings_clear_browsing_data_handler.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 18 matching lines @@
                  base::Unretained(this)));
 }
 
 ClearBrowsingDataHandler::~ClearBrowsingDataHandler() {
   if (remover_)
     remover_->RemoveObserver(this);
 }
 
 void ClearBrowsingDataHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
-      "performClearBrowserData",
-      base::Bind(&ClearBrowsingDataHandler::HandleClearBrowserData,
+      "clearBrowsingData",
+      base::Bind(&ClearBrowsingDataHandler::HandleClearBrowsingData,
                  base::Unretained(this)));
 }
 
-void ClearBrowsingDataHandler::HandleClearBrowserData(
+void ClearBrowsingDataHandler::HandleClearBrowsingData(
     const base::ListValue* args) {
   // We should never be called when the previous clearing has not yet finished.
   CHECK(!remover_);
+  CHECK_EQ(1U, args->GetSize());
+  CHECK(webui_callback_id_.empty());
+  CHECK(args->GetString(0, &webui_callback_id_));
 
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
   int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
   // Don't try to clear LSO data if it's not supported.
   if (!*clear_plugin_lso_data_enabled_)
     site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 
   int remove_mask = 0;
@@ skipping 70 matching lines @@
   remover_->AddObserver(this);
   remover_->Remove(
       BrowsingDataRemover::Period(
           static_cast<BrowsingDataRemover::TimePeriod>(period_selected)),
       remove_mask, origin_mask);
 }
 
 void ClearBrowsingDataHandler::OnBrowsingDataRemoverDone() {
   remover_->RemoveObserver(this);
   remover_ = nullptr;
-  web_ui()->CallJavascriptFunction("SettingsClearBrowserData.doneClearing");
+  ResolveJavascriptCallback(
+      base::StringValue(webui_callback_id_),
+      *base::Value::CreateNullValue());
+  webui_callback_id_.clear();
 }
 
 void ClearBrowsingDataHandler::OnBrowsingHistoryPrefChanged() {
   web_ui()->CallJavascriptFunction(
-      "SettingsClearBrowserData.setAllowDeletingHistory",
+      "cr.webUIListenerCallback",
+      base::StringValue("browsing-history-pref-changed"),
       base::FundamentalValue(*allow_deleting_browser_history_));
 }
 
 }  // namespace settings