Revert 115929 - Convert stragglers not on spreadsheet to base::Bind()

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/9035002

TBR=ajwong@chromium.org
Review URL: http://codereview.chromium.org/9006057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115934 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 7e65ac8..1043798 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -222,7 +222,7 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
 
   chromeos::DBusThreadManager::Shutdown();
 
-  if (parameters().ui_task.is_null() && chromeos::CrosLibrary::Get())
+  if (!parameters().ui_task && chromeos::CrosLibrary::Get())
     chromeos::CrosLibrary::Shutdown();
 
   // To be precise, logout (browser shutdown) is not yet done, but the
@@ -249,7 +249,7 @@ void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() {
   // Initialize CrosLibrary only for the browser, unless running tests
   // (which do their own CrosLibrary setup).
-  if (parameters().ui_task.is_null()) {
+  if (!parameters().ui_task) {
     bool use_stub = parameters().command_line.HasSwitch(switches::kStubCros);
     chromeos::CrosLibrary::Initialize(use_stub);
   }
@@ -341,7 +341,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
 
   // Tests should be able to tune login manager before showing it.
   // Thus only show login manager in normal (non-testing) mode.
-  if (parameters().ui_task.is_null())
+  if (!parameters().ui_task)
     OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
 
   ChromeBrowserMainPartsLinux::PostProfileInit();
@@ -359,10 +359,8 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
   // Listen for system key events so that the user will be able to adjust the
   // volume on the login screen, if Chrome is running on Chrome OS
   // (i.e. not Linux desktop), and in non-test mode.
-  //
-  // ui_task is non-NULL when running tests.
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS() &&
-      parameters().ui_task.is_null()) {
+      !parameters().ui_task) {  // ui_task is non-NULL when running tests.
     chromeos::SystemKeyEventListener::Initialize();
   }