Miscellaneous cleanups from several months ago I never got around to landing.

chrome/browser/printing/print_preview_tab_controller.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 "chrome/browser/printing/print_preview_tab_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 261 matching lines @@
   PrintPreviewTabMap::iterator it = preview_tab_map_.find(preview_tab);
   if (it != preview_tab_map_.end())
     return preview_tab_map_[preview_tab];
   return NULL;
 }
 
 void PrintPreviewTabController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  switch (type) {
-    case content::NOTIFICATION_RENDERER_PROCESS_CLOSED: {
-      OnRendererProcessClosed(
-          content::Source<content::RenderProcessHost>(source).ptr());
-      break;
-    }
-    case chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED: {
-      OnTabContentsDestroyed(content::Source<TabContents>(source).ptr());
-      break;
-    }
-    case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
-      NavigationController* controller =
-          content::Source<NavigationController>(source).ptr();
-      TabContents* tab = TabContents::FromWebContents(
-          controller->GetWebContents());
-      content::LoadCommittedDetails* load_details =
-          content::Details<content::LoadCommittedDetails>(details).ptr();
-      OnNavEntryCommitted(tab, load_details);
-      break;
-    }
-    default: {
-      NOTREACHED();
-      break;
-    }
+  if (type == content::NOTIFICATION_RENDERER_PROCESS_CLOSED) {
+    OnRendererProcessClosed(
+        content::Source<content::RenderProcessHost>(source).ptr());
+  } else if (type == chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED) {
+    OnTabContentsDestroyed(content::Source<TabContents>(source).ptr());
+  } else {
+    DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type);
+    TabContents* tab = TabContents::FromWebContents(
+        content::Source<NavigationController>(source)->GetWebContents());
+    OnNavEntryCommitted(tab,
+        content::Details<content::LoadCommittedDetails>(details).ptr());
   }
 }
 
 // static
 bool PrintPreviewTabController::IsPrintPreviewTab(TabContents* tab) {
   return IsPrintPreviewURL(tab->web_contents()->GetURL());
 }
 
 // static
 bool PrintPreviewTabController::IsPrintPreviewURL(const GURL& url) {
@@ skipping 148 matching lines @@
   if (initiator_tab && preview_tab->web_contents()->GetWebUI()) {
     PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
         preview_tab->web_contents()->GetWebUI()->GetController());
     print_preview_ui->SetInitiatorTabURLAndTitle(
         initiator_tab->web_contents()->GetURL().spec(),
         initiator_tab->print_view_manager()->RenderSourceName());
   }
 }
 
 void PrintPreviewTabController::AddObservers(TabContents* tab) {
-  WebContents* contents = tab->web_contents();
+  WebContents* web_contents = tab->web_contents();
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  content::Source<TabContents>(tab));
-  registrar_.Add(
-      this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::Source<NavigationController>(&contents->GetController()));
+  registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+      content::Source<NavigationController>(&web_contents->GetController()));
 
   // Multiple sites may share the same RenderProcessHost, so check if this
   // notification has already been added.
-  content::RenderProcessHost* rph = tab->web_contents()->GetRenderProcessHost();
+  content::Source<content::RenderProcessHost> rph_source(
+      web_contents->GetRenderProcessHost());
   if (!registrar_.IsRegistered(this,
-                               content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                               content::Source<content::RenderProcessHost>(
-                                  rph))) {
+      content::NOTIFICATION_RENDERER_PROCESS_CLOSED, rph_source)) {
     registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                   content::Source<content::RenderProcessHost>(rph));
+                   rph_source);
   }
 }
 
 void PrintPreviewTabController::RemoveObservers(TabContents* tab) {
-  WebContents* contents = tab->web_contents();
+  WebContents* web_contents = tab->web_contents();
   registrar_.Remove(this, chrome::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                     content::Source<TabContents>(tab));
-  registrar_.Remove(
-      this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::Source<NavigationController>(&contents->GetController()));
+  registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+      content::Source<NavigationController>(&web_contents->GetController()));
 
   // Multiple sites may share the same RenderProcessHost, so check if this
   // notification has already been added.
-  content::RenderProcessHost* rph = tab->web_contents()->GetRenderProcessHost();
+  content::Source<content::RenderProcessHost> rph_source(
+      web_contents->GetRenderProcessHost());
   if (registrar_.IsRegistered(this,
-                              content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                              content::Source<content::RenderProcessHost>(
-                                  rph))) {
+      content::NOTIFICATION_RENDERER_PROCESS_CLOSED, rph_source)) {
     registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                      content::Source<content::RenderProcessHost>(rph));
+                      rph_source);
   }
 }
 
 void PrintPreviewTabController::RemoveInitiatorTab(TabContents* initiator_tab) {
   TabContents* preview_tab = GetPrintPreviewForTab(initiator_tab);
   DCHECK(preview_tab);
   // Update the map entry first, so when the print preview tab gets destroyed
   // and reaches RemovePreviewTab(), it does not attempt to also remove the
   // initiator tab's observers.
   preview_tab_map_[preview_tab] = NULL;
@@ skipping 21 matching lines @@
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->web_contents()->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnTabDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing