Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

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 142 matching lines @@
       return;
     }
     registered_web_contents_.push_back(
         WebContentsInfo(web_contents, 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::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                     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(type == content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED ||
-           type == content::NOTIFICATION_WEB_CONTENTS_SWAPPED);
+           type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED);
 
     WebContents* web_contents = content::Source<WebContents>(source).ptr();
     std::vector<WebContentsInfo>::iterator iter = FindWebContents(web_contents);
     DCHECK(iter != registered_web_contents_.end());
     int render_process_id = iter->render_process_id;
     int render_view_id = iter->render_view_id;
     registered_web_contents_.erase(iter);
 
     registrar_->Remove(this,
-                       content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+                       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
                        content::Source<WebContents>(web_contents));
     registrar_->Remove(this,
                        content::NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
                        content::Source<WebContents>(web_contents));
 
     BrowserThread::PostTask(callback_thread_, FROM_HERE, base::Bind(
         tab_closed_callback_, render_process_id, render_view_id));
   }
 
  private:
@@ skipping 230 matching lines @@
     allowed = true;
     if (js_api)
       check_permission = true;
   }
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback, check_permission, allowed));
 }
 
 }  // namespace speech