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"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/notify_done_forwarder.h"
 #include "content/shell/shell_browser_main_parts.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_devtools_frontend.h"
 #include "content/shell/shell_javascript_dialog_manager.h"
 #include "content/shell/webkit_test_controller.h"
 
 // Content area size for newly created windows.
 static const int kTestWindowWidth = 800;
 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;
 
+class Shell::DevToolsWebContentsObserver : public WebContentsObserver {
+ public:
+  DevToolsWebContentsObserver(Shell* shell, WebContents* web_contents)
+      : WebContentsObserver(web_contents),
+        shell_(shell) {
+  }
+
+  // WebContentsObserver
+  virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE {
+    shell_->OnDevToolsWebContentsDestroyed();
+  }
+
+ private:
+  Shell* shell_;
+
+  DISALLOW_COPY_AND_ASSIGN(DevToolsWebContentsObserver);
+};
+
 Shell::Shell(WebContents* web_contents)
     : 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();
@@ skipping 130 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()));
+  devtools_observer_.reset(new DevToolsWebContentsObserver(
+      this, 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()));
+  devtools_observer_.reset();
   devtools_frontend_->Close();
   devtools_frontend_ = NULL;
 }
 
 gfx::NativeView Shell::GetContentView() {
   if (!web_contents_)
     return NULL;
   return web_contents_->GetView()->GetNativeView();
 }
 
@@ skipping 96 matching lines @@
                     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();
   }
 }
 
+void Shell::OnDevToolsWebContentsDestroyed() {
+  devtools_observer_.reset();
+  devtools_frontend_ = NULL;
+}
+
 }  // namespace content