Make GetIntentServicesForExtensionFilter work synchronously

chrome/browser/ui/intents/web_intent_picker_controller.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/ui/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 399 matching lines @@
 
  intents_dispatcher_->ResetDispatch();
 }
 
 void WebIntentPickerController::OnClosing() {
   picker_shown_ = false;
   picker_ = NULL;
 }
 
 void WebIntentPickerController::OnExtensionInstallSuccess(
-    const std::string& id) {
-  picker_->OnExtensionInstallSuccess(id);
-  pending_async_count_++;
+    const std::string& extension_id) {
+  // OnExtensionInstallSuccess is called via NotificationService::Notify before
+  // the extension is added to the ExtensionService. Dispatch via PostTask to
+  // allow ExtensionService to update.
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(
+          &WebIntentPickerController::DispatchToInstalledExtension,
+          base::Unretained(this),
+          extension_id));
+}
+
+void WebIntentPickerController::DispatchToInstalledExtension(
+    const std::string& extension_id) {
+  picker_->OnExtensionInstallSuccess(extension_id);
+  WebIntentsRegistry::IntentServiceList services;
   GetWebIntentsRegistry(tab_contents_)->GetIntentServicesForExtensionFilter(
-      picker_model_->action(),
-      picker_model_->mimetype(),
-      id,
-      base::Bind(
-          &WebIntentPickerController::OnExtensionInstallServiceAvailable,
-          weak_ptr_factory_.GetWeakPtr()));
+      picker_model_->action(), picker_model_->mimetype(),
+      extension_id,
+      &services);
+
+  // Extension must be registered with registry by now.
+  DCHECK(services.size() > 0);
+
+  // TODO(binji): We're going to need to disambiguate if there are multiple
+  // services. For now, just choose the first.
+  const webkit_glue::WebIntentServiceData& service_data = services[0];
+
+  picker_model_->AddInstalledService(
+      service_data.title, service_data.service_url,
+      ConvertDisposition(service_data.disposition));
+  OnServiceChosen(
+      service_data.service_url,
+      ConvertDisposition(service_data.disposition));
   AsyncOperationFinished();
 }
 
 void WebIntentPickerController::OnExtensionInstallFailure(
     const std::string& id,
     const std::string& error) {
   picker_->OnExtensionInstallFailure(id);
   AsyncOperationFinished();
 }
 
@@ skipping 283 matching lines @@
 
 void WebIntentPickerController::SourceDispatcherReplied(
     webkit_glue::WebIntentReplyType reply_type) {
   source_intents_dispatcher_ = NULL;
 }
 
 bool WebIntentPickerController::ShowLocationBarPickerTool() {
   return window_disposition_source_ || source_intents_dispatcher_;
 }
 
-void WebIntentPickerController::OnExtensionInstallServiceAvailable(
-    const std::vector<webkit_glue::WebIntentServiceData>& services) {
-  DCHECK(services.size() > 0);
-
-  // TODO(binji): We're going to need to disambiguate if there are multiple
-  // services. For now, just choose the first.
-  const webkit_glue::WebIntentServiceData& service_data = services[0];
-  picker_model_->AddInstalledService(
-      service_data.title, service_data.service_url,
-      ConvertDisposition(service_data.disposition));
-  OnServiceChosen(
-      service_data.service_url,
-      ConvertDisposition(service_data.disposition));
-  AsyncOperationFinished();
-}
-
 void WebIntentPickerController::AsyncOperationFinished() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (--pending_async_count_ == 0) {
     if (picker_)
       picker_->OnPendingAsyncCompleted();
   }
 }
 
 void WebIntentPickerController::CreatePicker() {
   // If picker is non-NULL, it was set by a test.
   if (picker_ == NULL)
     picker_ = WebIntentPicker::Create(tab_contents_, this, picker_model_.get());
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   if (picker_)
     picker_->Close();
 }