Make GetIntentServicesForExtensionFilter work synchronously

chrome/browser/intents/web_intents_registry_unittest.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 "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 240 matching lines @@
 
 TEST_F(WebIntentsRegistryTest, GetIntentServicesForExtensionFilter) {
   scoped_refptr<Extension> share_extension(
       LoadAndExpectSuccess("intent_valid.json"));
   scoped_refptr<Extension> edit_extension(
       LoadAndExpectSuccess("intent_valid_2.json"));
   extensions_.Insert(share_extension);
   extensions_.Insert(edit_extension);
   ASSERT_EQ(2U, extensions_.size());
 
-  ServiceListConsumer consumer;
+  WebIntentsRegistry::IntentServiceList services;
   registry_.GetIntentServicesForExtensionFilter(
       ASCIIToUTF16("http://webintents.org/edit"),
       ASCIIToUTF16("image/*"),
       edit_extension->id(),
-      base::Bind(&ServiceListConsumer::Accept,
-          base::Unretained(&consumer)));
-  consumer.WaitForData();
-  ASSERT_EQ(1U, consumer.services_.size());
+      &services);
+  ASSERT_EQ(1U, services.size());
 
   EXPECT_EQ(edit_extension->url().spec() + "services/edit",
-            consumer.services_[0].service_url.spec());
+            services[0].service_url.spec());
 }
 
 TEST_F(WebIntentsRegistryTest, GetAllIntents) {
   webkit_glue::WebIntentServiceData service;
   service.service_url = GURL("http://google.com");
   service.action = ASCIIToUTF16("share");
   service.type = ASCIIToUTF16("image/*");
   service.title = ASCIIToUTF16("Google's Sharing Service");
   registry_.RegisterIntentService(service);
 
@@ skipping 444 matching lines @@
   ServiceListConsumer consumer;
   registry_.GetIntentServices(ASCIIToUTF16("http://webintents.org/share"),
                               ASCIIToUTF16("image/*"),
                               base::Bind(&ServiceListConsumer::Accept,
                                          base::Unretained(&consumer)));
 
   consumer.WaitForData();
   ASSERT_EQ(1U, consumer.services_.size());
   EXPECT_EQ(ASCIIToUTF16("image/png,image/jpg"), consumer.services_[0].type);
 }