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

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
===================================================================
--- chrome/browser/ui/omnibox/omnibox_view_browsertest.cc	(revision 153800)
+++ chrome/browser/ui/omnibox/omnibox_view_browsertest.cc	(working copy)
@@ -224,11 +224,10 @@
       return;
 
     content::NotificationRegistrar registrar;
-    registrar.Add(
-        this,
-        tab_count < expected_tab_count
-            ? static_cast<int>(chrome::NOTIFICATION_TAB_PARENTED)
-            : static_cast<int>(content::NOTIFICATION_WEB_CONTENTS_DESTROYED),
+    registrar.Add(this,
+        (tab_count < expected_tab_count) ?
+            static_cast<int>(chrome::NOTIFICATION_TAB_PARENTED) :
+            static_cast<int>(content::NOTIFICATION_WEB_CONTENTS_DESTROYED),
         content::NotificationService::AllSources());
 
     while (!HasFailure() && browser->tab_count() != expected_tab_count)