web intents. Fix callbacks to restore tab management on service exit.

chrome/browser/ui/intents/web_intent_picker_controller.h

Index: chrome/browser/ui/intents/web_intent_picker_controller.h
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.h b/chrome/browser/ui/intents/web_intent_picker_controller.h
index d5b5d614c23d715372b0d8d785868dd9847e180c..cd7920e537349c397bdadea4e6269f419a6c816c 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller.h
+++ b/chrome/browser/ui/intents/web_intent_picker_controller.h
@@ -306,11 +306,17 @@ class WebIntentPickerController
   // Request consumer used when asynchronously loading favicons.
   CancelableRequestConsumerTSimple<size_t> favicon_consumer_;
 
+  // Factory for weak pointers used in callbacks for async calls to load the
+  // picker model.

[groby-ooo-7-16, 2012/09/21 02:25:21]

FYI: weak_ptr_factory_ as a member variable is a common enough idiom that it's
usually not necessary to document.

[Greg Billock, 2012/09/21 05:10:09]

The intersting bit is the part about where they're used. Given that we have
three, I think there could be confusion. :-)

   base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_;
 
   // Timer factory for minimum display time of "waiting" dialog.
   base::WeakPtrFactory<WebIntentPickerController> timer_factory_;
 
+  // Weak pointers for the dispatcher OnSendReturnMessage will not be
+  // cancelled on picker close.
+  base::WeakPtrFactory<WebIntentPickerController> dispatcher_factory_;
+
   // Bucket identifier for UMA reporting. Saved off in a field
   // to avoid repeated calculation of the bucket across
   // multiple UMA calls. Should be recalculated each time