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

chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 206 matching lines @@
         type, source);
   }
 
   void WaitForTabOpenOrCloseForBrowser(const Browser* browser,
                                        int expected_tab_count) {
     int tab_count = browser->tab_count();
     if (tab_count == expected_tab_count)
       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)
       content::RunMessageLoop();
 
     ASSERT_EQ(expected_tab_count, browser->tab_count());
   }
 
   void WaitForTabOpenOrClose(int expected_tab_count) {
     WaitForTabOpenOrCloseForBrowser(browser(), expected_tab_count);
@@ skipping 1429 matching lines @@
 
   // Middle-clicking shouldn't select all the text either.
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::LEFT, kClickOffset, kClickOffset));
   ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter());
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::MIDDLE, kClickOffset, kClickOffset));
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 #endif  // defined(USE_AURA)