WebUI: Allow rejecting a promise that is returned from cr.sendWithPromise().

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

 // Copyright 2016 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/search_engines_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 181 matching lines @@
     }
   }
   return dict;
 }
 
 void SearchEnginesHandler::HandleGetSearchEnginesList(
     const base::ListValue* args) {
   CHECK_EQ(1U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
-  CallJavascriptCallback(*callback_id, *GetSearchEnginesList());
+  ResolveJavascriptCallback(*callback_id, *GetSearchEnginesList());
 }
 
 void SearchEnginesHandler::HandleSetDefaultSearchEngine(
     const base::ListValue* args) {
   int index;
   if (!ExtractIntegerValue(args, &index)) {
     NOTREACHED();
     return;
   }
   if (index < 0 || index >= list_controller_->table_model()->RowCount())
@@ skipping 58 matching lines @@
 void SearchEnginesHandler::HandleValidateSearchEngineInput(
     const base::ListValue* args) {
   CHECK_EQ(3U, args->GetSize());
 
   const base::Value* callback_id;
   std::string field_name;
   std::string field_value;
   CHECK(args->Get(0, &callback_id));
   CHECK(args->GetString(1, &field_name));
   CHECK(args->GetString(2, &field_value));
-  CallJavascriptCallback(
+  ResolveJavascriptCallback(
       *callback_id,
       base::FundamentalValue(CheckFieldValidity(field_name, field_value)));
 }
 
 bool SearchEnginesHandler::CheckFieldValidity(const std::string& field_name,
                                               const std::string& field_value) {
   if (!edit_controller_.get())
     return false;
 
   bool is_valid = false;
@@ skipping 43 matching lines @@
   std::string extension_id;
   CHECK(args->GetString(0, &extension_id));
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   DCHECK(extension_service);
   extension_service->DisableExtension(
       extension_id, extensions::Extension::DISABLE_USER_ACTION);
 }
 
 }  // namespace settings