Merge 258544 "Fix crash introduced in https://codereview.chromiu..."

content/browser/android/content_view_statics.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 <jni.h>
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 26 matching lines @@
 // Note that this class is only accessed from the UI thread.
 class SuspendedProcessWatcher : public content::RenderProcessHostObserver {
  public:
 
   // If the process crashes, stop watching the corresponding RenderProcessHost
   // and ensure it doesn't get over-resumed.
   virtual void RenderProcessExited(content::RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
                                    int exit_code) OVERRIDE {
-    std::vector<int>::iterator pos = std::find(suspended_processes_.begin(),
-                                               suspended_processes_.end(),
-                                               host->GetID());
-    DCHECK_NE(pos, suspended_processes_.end());
-    host->RemoveObserver(this);
-    suspended_processes_.erase(pos);
+    StopWatching(host);
+  }
+
+  virtual void RenderProcessHostDestroyed(
+      content::RenderProcessHost* host) OVERRIDE {
+    StopWatching(host);
   }
 
   // Suspends timers in all current render processes.
   void SuspendWebKitSharedTimers() {
     DCHECK(suspended_processes_.empty());
 
     for (content::RenderProcessHost::iterator i(
             content::RenderProcessHost::AllHostsIterator());
          !i.IsAtEnd(); i.Advance()) {
       content::RenderProcessHost* host = i.GetCurrentValue();
@@ skipping 12 matching lines @@
       content::RenderProcessHost* host =
           content::RenderProcessHost::FromID(*it);
       DCHECK(host);
       host->RemoveObserver(this);
       host->Send(new ViewMsg_SetWebKitSharedTimersSuspended(false));
     }
     suspended_processes_.clear();
   }
 
  private:
+  void StopWatching(content::RenderProcessHost* host) {
+    std::vector<int>::iterator pos = std::find(suspended_processes_.begin(),
+                                               suspended_processes_.end(),
+                                               host->GetID());
+    DCHECK_NE(pos, suspended_processes_.end());
+    host->RemoveObserver(this);
+    suspended_processes_.erase(pos);
+  }
+
   std::vector<int /* RenderProcessHost id */> suspended_processes_;
 };
 
 base::LazyInstance<SuspendedProcessWatcher> g_suspended_processes_watcher =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // Returns the first substring consisting of the address of a physical location.
 static jstring FindAddress(JNIEnv* env, jclass clazz, jstring addr) {
@@ skipping 14 matching lines @@
   }
 }
 
 namespace content {
 
 bool RegisterWebViewStatics(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content