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

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 95 matching lines @@
         pending_async_completed_(false),
         num_inline_disposition_(0),
         delegate_(NULL) {
   }
 
   void MockClose() {
     delegate_->OnClosing();
   }
 
   // WebIntentPicker implementation.
-  virtual void Close() OVERRIDE {}
+  virtual void Close() OVERRIDE { StopWaiting(); }
   virtual void SetActionString(const string16& action) OVERRIDE {}
   virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE {
     num_extensions_installed_++;
   }
   virtual void OnExtensionInstallFailure(const std::string& id) OVERRIDE {}
   virtual void OnInlineDispositionAutoResize(const gfx::Size& size) OVERRIDE {}
   virtual void OnPendingAsyncCompleted() OVERRIDE {
     StopWaiting();
   }
 
@@ skipping 18 matching lines @@
   void Wait() {
     if (!pending_async_completed_) {
       message_loop_started_ = true;
       content::RunMessageLoop();
       pending_async_completed_ = false;
     }
   }
 
   void StopWaiting() {
     pending_async_completed_ = true;
-    if (message_loop_started_)
+    if (message_loop_started_) {
+      message_loop_started_ = false;
       MessageLoop::current()->Quit();
+    }
   }
 
   int num_installed_services_;
   int num_icons_changed_;
   int num_extension_icons_changed_;
   int num_extensions_installed_;
   bool message_loop_started_;
   bool pending_async_completed_;
   int num_inline_disposition_;
   WebIntentPickerDelegate* delegate_;
@@ skipping 468 matching lines @@
 
   EXPECT_EQ(2, picker_.num_installed_services_);
 
   // The tab is shown immediately without needing to call OnServiceChosen.
   ASSERT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL(kServiceURL1),
             chrome::GetActiveWebContents(browser())->GetURL());
 
   EXPECT_TRUE(dispatcher.dispatched_);
 }