Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

content/browser/android/content_view_core_impl.cc

 // Copyright 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 "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 200 matching lines @@
 
 void ContentViewCoreImpl::OnJavaContentViewCoreDestroyed(JNIEnv* env,
                                                          jobject obj) {
   DCHECK(env->IsSameObject(java_ref_.get(env).obj(), obj));
   java_ref_.reset();
 }
 
 void ContentViewCoreImpl::InitWebContents() {
   DCHECK(web_contents_);
   notification_registrar_.Add(
-      this, NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      Source<NavigationController>(&web_contents_->GetController()));
+      this, NOTIFICATION_WEB_CONTENTS_SWAPPED,
+      Source<WebContents>(web_contents_));

[joth, 2013/09/06 21:33:25]

you're registering this twice now

[Avi (use Gerrit), 2013/09/06 21:39:07]

Yep; fixed.

   notification_registrar_.Add(
       this, NOTIFICATION_RENDERER_PROCESS_CREATED,
       content::NotificationService::AllBrowserContextsAndSources());
   notification_registrar_.Add(
       this, NOTIFICATION_WEB_CONTENTS_CONNECTED,
       Source<WebContents>(web_contents_));
   notification_registrar_.Add(
       this, NOTIFICATION_WEB_CONTENTS_SWAPPED,
       Source<WebContents>(web_contents_));
 
   static_cast<WebContentsViewAndroid*>(web_contents_->GetView())->
       SetContentViewCore(this);
   DCHECK(!web_contents_->GetUserData(kContentViewUserDataKey));
   web_contents_->SetUserData(kContentViewUserDataKey,
                              new ContentViewUserData(this));
 }
 
 void ContentViewCoreImpl::Observe(int type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   switch (type) {
-    case NOTIFICATION_RENDER_VIEW_HOST_CHANGED: {
+    case NOTIFICATION_WEB_CONTENTS_SWAPPED: {
       std::pair<RenderViewHost*, RenderViewHost*>* switched_details =
           Details<std::pair<RenderViewHost*, RenderViewHost*> >(details).ptr();
       int old_pid = 0;
       if (switched_details->first) {
         old_pid = GetRenderProcessIdFromRenderViewHost(
             switched_details->first);
       }
       int new_pid = GetRenderProcessIdFromRenderViewHost(
           web_contents_->GetRenderViewHost());
       if (new_pid != old_pid) {
@@ skipping 26 matching lines @@
       break;
     }
     case NOTIFICATION_WEB_CONTENTS_CONNECTED: {
       JNIEnv* env = AttachCurrentThread();
       ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
       if (!obj.is_null()) {
         Java_ContentViewCore_onWebContentsConnected(env, obj.obj());
       }
       break;
     }
-    case NOTIFICATION_WEB_CONTENTS_SWAPPED: {
-      JNIEnv* env = AttachCurrentThread();
-      ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-      if (!obj.is_null()) {
-        Java_ContentViewCore_onWebContentsSwapped(env, obj.obj());

[joth, 2013/09/06 21:33:25]

onWebContentsSwapped would never be called after this patch. So needs a java
side cleanup too?

+tedchoc maybe more familiar with this flow.

[Avi (use Gerrit), 2013/09/06 21:39:07]

Note that onWebContentsSwapped was never called without being preceded by
onRenderProcessSwap. I have no idea what onWebContentsSwapped does. That's why I
need your help.

-      }
-    }
   }
 }
 
 RenderWidgetHostViewAndroid*
     ContentViewCoreImpl::GetRenderWidgetHostViewAndroid() {
   RenderWidgetHostView* rwhv = NULL;
   if (web_contents_) {
     rwhv = web_contents_->GetRenderWidgetHostView();
     if (web_contents_->ShowingInterstitialPage()) {
       rwhv = static_cast<InterstitialPageImpl*>(
@@ skipping 1272 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<jint>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content