Make GetIntentServicesForExtensionFilter work synchronously

chrome/browser/intents/web_intents_registry.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/intents/web_intents_registry.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 387 matching lines @@
 
   QueryAdapter* query = new QueryAdapter(this, handler);
   query->query_handle_ = wds_->GetWebIntentServicesForURL(
       UTF8ToUTF16(service.service_url.spec()), query);
 }
 
 void WebIntentsRegistry::GetIntentServicesForExtensionFilter(
         const string16& action,
         const string16& type,
         const std::string& extension_id,
-        const QueryCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  DCHECK(!callback.is_null());
-
-  const QueryParams params(action, type);
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(
-          &WebIntentsRegistry::DoGetIntentServicesForExtensionFilter,
-          base::Unretained(this),
-          params,
-          extension_id,
-          callback));
-}
-
-void WebIntentsRegistry::DoGetIntentServicesForExtensionFilter(
-    const QueryParams& params,
-    const std::string& extension_id,
-    const QueryCallback& callback) {
-  IntentServiceList matching_services;
-
+        IntentServiceList* services) {
   if (extension_service_) {
     const Extension* extension =
         extension_service_->GetExtensionById(extension_id, false);
     AddMatchingServicesForExtension(*extension,
-                                    params.action_,
-                                    &matching_services);
-    FilterServicesByType(params.type_, &matching_services);
+                                    action,
+                                    services);
+    FilterServicesByType(type, services);
   }
-
-  callback.Run(matching_services);
 }
 
 void WebIntentsRegistry::RegisterDefaultIntentService(
     const DefaultWebIntentService& default_service) {
   DCHECK(wds_.get());
   wds_->AddDefaultWebIntentService(default_service);
 }
 
 void WebIntentsRegistry::UnregisterDefaultIntentService(
     const DefaultWebIntentService& default_service) {
@@ skipping 84 matching lines @@
 void WebIntentsRegistry::ReleaseQuery(QueryAdapter* query) {
   QueryVector::iterator it = std::find(
       pending_queries_.begin(), pending_queries_.end(), query);
   if (it != pending_queries_.end()) {
     pending_queries_.erase(it);
     delete query;
   } else {
     NOTREACHED();
   }
 }