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

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

Index: chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index 66570f1833b47ca8280cd13a424c45e838961dcd..0cde828327e79eb157e0b82fafc8513e1a78eb58 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -36,15 +36,18 @@ ClearBrowsingDataHandler::~ClearBrowsingDataHandler() {
 
 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();
@@ -135,12 +138,16 @@ void ClearBrowsingDataHandler::HandleClearBrowserData(
 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_));
 }