content: Remove usage of NOTIFICATION_WEB_CONTENTS_DESTROYED from content

content/shell/shell.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 "content/shell/shell.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 25 matching lines @@
 static const int kTestWindowHeight = 600;
 
 namespace content {
 
 std::vector<Shell*> Shell::windows_;
 base::Callback<void(Shell*)> Shell::shell_created_callback_;
 
 bool Shell::quit_message_loop_ = true;
 
 Shell::Shell(WebContents* web_contents)
-    : devtools_frontend_(NULL),
+    : WebContentsObserver(NULL),  // Watch DevTools WebContents, not the above.
+      devtools_frontend_(NULL),
       is_fullscreen_(false),
       window_(NULL),
       url_edit_view_(NULL),
 #if defined(OS_WIN) && !defined(USE_AURA)
       default_edit_wnd_proc_(0),
 #endif
       headless_(false) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDumpRenderTree) &&
       !command_line.HasSwitch(switches::kDisableHeadlessForLayoutTests)) {
@@ skipping 128 matching lines @@
   PlatformEnableUIControl(FORWARD_BUTTON, current_index < max_index);
   PlatformEnableUIControl(STOP_BUTTON, web_contents_->IsLoading());
 }
 
 void Shell::ShowDevTools() {
   if (devtools_frontend_) {
     devtools_frontend_->Focus();
     return;
   }
   devtools_frontend_ = ShellDevToolsFrontend::Show(web_contents());
-  registrar_.Add(this,
-                 NOTIFICATION_WEB_CONTENTS_DESTROYED,
-                 Source<WebContents>(
-                     devtools_frontend_->frontend_shell()->web_contents()));
+  WebContentsObserver::Observe(
+      devtools_frontend_->frontend_shell()->web_contents());
 }
 
 void Shell::CloseDevTools() {
   if (!devtools_frontend_)
     return;
-  registrar_.Remove(this,
-                    NOTIFICATION_WEB_CONTENTS_DESTROYED,
-                    Source<WebContents>(
-                        devtools_frontend_->frontend_shell()->web_contents()));
+  WebContentsObserver::Observe(NULL);
   devtools_frontend_->Close();
   devtools_frontend_ = NULL;
 }
 
 gfx::NativeView Shell::GetContentView() {
   if (!web_contents_)
     return NULL;
   return web_contents_->GetView()->GetNativeView();
 }
 
@@ skipping 85 matching lines @@
 }
 
 void Shell::ActivateContents(WebContents* contents) {
   contents->GetRenderViewHost()->Focus();
 }
 
 void Shell::DeactivateContents(WebContents* contents) {
   contents->GetRenderViewHost()->Blur();
 }
 
+void Shell::WebContentsDestroyed(WebContents* web_contents) {
+  devtools_frontend_ = NULL;
+  WebContentsObserver::Observe(NULL);
+}
+
 void Shell::Observe(int type,
                     const NotificationSource& source,
                     const NotificationDetails& details) {
   if (type == NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED) {
     std::pair<NavigationEntry*, bool>* title =
         Details<std::pair<NavigationEntry*, bool> >(details).ptr();
 
     if (title->first) {
       string16 text = title->first->GetTitle();
       PlatformSetTitle(text);
     }
-  } else if (type == NOTIFICATION_WEB_CONTENTS_DESTROYED) {
-    devtools_frontend_ = NULL;
-    registrar_.Remove(this, NOTIFICATION_WEB_CONTENTS_DESTROYED, source);
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace content