Make sure controller is properly reset when the picker is closed.

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 672 matching lines @@
 }
 
 void WebIntentPickerController::OnIntentDataArrived() {
   DCHECK(picker_model_.get());
 
   if (!pending_cws_request_ &&
       pending_registry_calls_count_ == 0)
     OnPickerEvent(kPickerEventAsyncDataComplete);
 }
 
+void WebIntentPickerController::Reset() {
+  // Abandon all callbacks.
+  weak_ptr_factory_.InvalidateWeakPtrs();
+  timer_factory_.InvalidateWeakPtrs();
+
+  // Reset state associated with callbacks.
+  pending_async_count_ = 0;
+  pending_registry_calls_count_ = 0;
+  pending_cws_request_ = false;
+
+  // Reset picker.
+  picker_model_.reset(new WebIntentPickerModel());
+  picker_shown_ = false;
+
+  DCHECK(tab_contents_);
+  tab_contents_->constrained_window_tab_helper()->BlockTabContent(false);
+}
+
 // static
 void WebIntentPickerController::DecodeExtensionIconAndResize(
     scoped_ptr<std::string> icon_response,
     const ExtensionIconAvailableCallback& callback,
     const base::Closure& unavailable_callback) {
   SkBitmap icon_bitmap;
   if (gfx::PNGCodec::Decode(
         reinterpret_cast<const unsigned char*>(icon_response->data()),
         icon_response->length(),
         &icon_bitmap)) {
@@ skipping 152 matching lines @@
       DCHECK(dialog_state_ == kPickerWaiting);
       break;
 
     case kPickerMain:
       // No DCHECK - main state can be reached from any state.
       // Ready to display data.
       picker_model_->SetWaitingForSuggestions(false);
       break;
 
     case kPickerHidden:
-      // Once the picker dialog is closed, abandon all pending callbacks.
-      weak_ptr_factory_.InvalidateWeakPtrs();
+      Reset();
       break;
 
     default:
       NOTREACHED();
       break;
 
   }
 
   dialog_state_ = state;
 
@@ skipping 10 matching lines @@
   picker_->SetActionString(GetIntentActionString(
       UTF16ToUTF8(picker_model_->action())));
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   SetDialogState(kPickerHidden);
   if (picker_)
     picker_->Close();
 }