Add support for unregistering web intents default by service_url.

chrome/browser/webdata/web_data_service.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/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
@@ skipping 316 matching lines @@
     const DefaultWebIntentService& service) {
   GenericRequest<DefaultWebIntentService>* request =
       new GenericRequest<DefaultWebIntentService>(
           this, GetNextRequestHandle(), NULL, service);
   RegisterRequest(request);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::RemoveDefaultWebIntentServiceImpl, this,
                     request));
 }
 
+void WebDataService::RemoveDefaultWebIntentServiceForServiceURL(
+    const GURL& service_url) {
+  GenericRequest<GURL>* request =
+      new GenericRequest<GURL>(
+          this, GetNextRequestHandle(), NULL, service_url);
+  RegisterRequest(request);
+  ScheduleTask(
+      FROM_HERE,
+      Bind(&WebDataService::RemoveDefaultWebIntentServiceForServiceURLImpl,
+           this,
+           request));

[James Hawkins, 2012/08/08 16:22:37]

Optional nit: Condense parameters to save a line.

[Steve McKay, 2012/08/08 17:54:42]

Collapsed entire call after method renaming.

+}
+
 WebDataService::Handle WebDataService::GetDefaultWebIntentServicesForAction(
     const string16& action,
     WebDataServiceConsumer* consumer) {
   DCHECK(consumer);
   GenericRequest<string16>* request = new GenericRequest<string16>(
           this, GetNextRequestHandle(), consumer, action);
   RegisterRequest(request);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::GetDefaultWebIntentServicesForActionImpl,
                     this, request));
@@ skipping 611 matching lines @@
     GenericRequest<DefaultWebIntentService>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     const DefaultWebIntentService& service = request->arg();
     db_->GetWebIntentsTable()->RemoveDefaultService(service);
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
+void WebDataService::RemoveDefaultWebIntentServiceForServiceURLImpl(
+    GenericRequest<GURL>* request) {
+  InitializeDatabaseIfNecessary();
+  if (db_ && !request->IsCancelled(NULL)) {
+    const GURL& service_url = request->arg();
+    db_->GetWebIntentsTable()->RemoveDefaultServicesForServiceURL(service_url);
+    ScheduleCommit();
+  }
+  request->RequestComplete();
+}
+
 void WebDataService::GetDefaultWebIntentServicesForActionImpl(
     GenericRequest<string16>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     std::vector<DefaultWebIntentService> result;
     db_->GetWebIntentsTable()->GetDefaultServices(
         request->arg(), &result);
     request->SetResult(
         new WDResult<std::vector<DefaultWebIntentService> >(
             WEB_INTENTS_DEFAULTS_RESULT, result));
@@ skipping 512 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }