Fixed the speech crash when the render view has gone away then users click "try again"

chrome/browser/speech/chrome_speech_recognition_manager_delegate.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/speech/chrome_speech_recognition_manager_delegate.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 150 matching lines @@
     // TODO(primiano) turn this line into a DCHECK once speech input extension
     // API is deprecated.
     if (!web_contents)
       return;
 
     // Avoid multiple registrations on |registrar_| for the same |web_contents|.
     if (registered_web_contents_.find(web_contents) !=
         registered_web_contents_.end()) {
       return;
     }
-    registered_web_contents_.insert(web_contents);
+    registered_web_contents_[web_contents] =
+        std::make_pair(render_process_id, render_view_id);
 
     // Lazy initialize the registrar.
     if (!registrar_.get())
       registrar_.reset(new content::NotificationRegistrar());
 
     registrar_->Add(this,
+                    content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+                    content::Source<WebContents>(web_contents));
+    registrar_->Add(this,
                     content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                     content::Source<WebContents>(web_contents));
   }
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-    DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED, type);
+    DCHECK(type == content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED ||
+           type == content::NOTIFICATION_WEB_CONTENTS_SWAPPED);
 
     WebContents* web_contents = content::Source<WebContents>(source).ptr();
-    int render_process_id = web_contents->GetRenderProcessHost()->GetID();
-    int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+    WebContentsMap::const_iterator iter =
+        registered_web_contents_.find(web_contents);
+    DCHECK(iter != registered_web_contents_.end());
+    int render_process_id = iter->second.first;
+    int render_view_id = iter->second.second;
 
     registrar_->Remove(this,
+                       content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+                       content::Source<WebContents>(web_contents));
+    registrar_->Remove(this,
                        content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                        content::Source<WebContents>(web_contents));
     registered_web_contents_.erase(web_contents);
 
     BrowserThread::PostTask(callback_thread_, FROM_HERE, base::Bind(
         tab_closed_callback_, render_process_id, render_view_id));
   }
 
  private:
   friend class base::RefCountedThreadSafe<TabWatcher>;
 
   virtual ~TabWatcher() {
     // Must be destroyed on the UI thread due to |registrar_| non thread-safety.
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   }
 
   // Lazy-initialized and used on the UI thread to handle web contents
   // notifications (tab closing).
   scoped_ptr<content::NotificationRegistrar> registrar_;
 
   // Keeps track of which WebContent(s) have been registered, in order to avoid
-  // double registrations on |registrar_|
-  std::set<content::WebContents*> registered_web_contents_;
+  // double registrations on |registrar_|. The ProcessID+ViewID pair is stored
+  // and used for |tab_closed_callback_| after the process has gone away.
+  typedef std::map< content::WebContents*, std::pair<int, int> > WebContentsMap;

[tommi (sloooow) - chröme, 2013/04/03 09:38:30]

no space after <

[tommi (sloooow) - chröme, 2013/04/03 09:38:30]

instead of std::pair, let's define a struct with proper names for these
variables.

[no longer working on chromium, 2013/04/03 11:19:55]

Done with changing the code to use vector with struct.

+  WebContentsMap registered_web_contents_;
 
   // Callback used to notify, on the thread specified by |callback_thread_| the
   // closure of a registered tab.
   TabClosedCallback tab_closed_callback_;
   content::BrowserThread::ID callback_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(TabWatcher);
 };
 
 ChromeSpeechRecognitionManagerDelegate
@@ skipping 296 matching lines @@
 }
 
 SpeechRecognitionBubbleController*
 ChromeSpeechRecognitionManagerDelegate::GetBubbleController() {
   if (!bubble_controller_.get())
     bubble_controller_ = new SpeechRecognitionBubbleController(this);
   return bubble_controller_.get();
 }
 
 }  // namespace speech