Revert an old change where I added a bunch of CHECKs to track down a crash.

The CHECKS were unhelpful, but we don't see the crash anymore.

BUG=15607

Review URL: http://codereview.chromium.org/553022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36671 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 38 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index d210ffe..ba2a503 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -123,12 +123,6 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       session_storage_namespace_id_(session_storage_namespace_id) {
   DCHECK(instance_);
   DCHECK(delegate_);
-
-  // TODO(mpcomplete): remove this notification (and registrar) when we figure
-  // out why we're crashing on process()->Init().
-  // http://code.google.com/p/chromium/issues/detail?id=15607
-  registrar_.Add(this, NotificationType::RENDERER_PROCESS_TERMINATED,
-                 NotificationService::AllSources());
 }
 
 RenderViewHost::~RenderViewHost() {
@@ -148,31 +142,9 @@ RenderViewHost::~RenderViewHost() {
       NotificationService::NoDetails());
 }
 
-void RenderViewHost::Observe(NotificationType type,
-                             const NotificationSource& source,
-                             const NotificationDetails& details) {
-  DCHECK(type == NotificationType::RENDERER_PROCESS_TERMINATED);
-  RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
-  if (rph == process()) {
-    // Try to get some debugging information on the stack.
-    bool no_listeners = rph->ListenersIterator().IsAtEnd();
-    bool live_instance = site_instance() != NULL;
-    CHECK(live_instance);
-    bool live_process = site_instance()->GetProcess() != NULL;
-    bool same_process = site_instance()->GetProcess() == rph;
-    CHECK(no_listeners);
-    CHECK(live_process);
-    CHECK(same_process);
-    CHECK(false) << "RenderViewHost should outlive its RenderProcessHost.";
-  }
-}
-
 bool RenderViewHost::CreateRenderView(
     URLRequestContextGetter* request_context) {
   DCHECK(!IsRenderViewLive()) << "Creating view twice";
-  CHECK(process());
-  CHECK(!process()->ListenersIterator().IsAtEnd()) <<
-      "Our process should have us as a listener.";
 
   // The process may (if we're sharing a process with another host that already
   // initialized it) or may not (we have our own process or the old process
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index e56c406..62a5e1f 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -10,7 +10,6 @@
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
-#include "chrome/common/notification_registrar.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/view_types.h"
 #include "net/base/load_states.h"
@@ -81,8 +80,7 @@ class URLRequestContextGetter;
 //  if we want to bring that and other functionality down into this object so
 //  it can be shared by others.
 //
-class RenderViewHost : public RenderWidgetHost,
-                       public NotificationObserver {
+class RenderViewHost : public RenderWidgetHost {
  public:
   // Returns the RenderViewHost given its ID and the ID of its render process.
   // Returns NULL if the IDs do not correspond to a live RenderViewHost.
@@ -607,11 +605,6 @@ class RenderViewHost : public RenderWidgetHost,
 
   void UpdateBackForwardListCount();
 
-  // NotificationObserver implementation.
-  void Observe(NotificationType type,
-               const NotificationSource& source,
-               const NotificationDetails& details);
-
   // The SiteInstance associated with this RenderViewHost.  All pages drawn
   // in this RenderViewHost are part of this SiteInstance.  Should not change
   // over time.
@@ -673,8 +666,6 @@ class RenderViewHost : public RenderWidgetHost,
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
-  NotificationRegistrar registrar_;
-
   // The session storage namespace id to be used by the associated render view.
   int64 session_storage_namespace_id_;