Fixes for handling of MockDBusThreadManager::GetSystemBus().

chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.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/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 34 matching lines @@
         observer_(NULL) {
   }
 
   virtual void SetUp() OVERRIDE {
     EXPECT_CALL(*mock_user_manager_.user_manager(), IsUserLoggedIn())
         .Times(AnyNumber())
         .WillRepeatedly(Return(false));
 
     MockDBusThreadManager* mock_dbus_thread_manager =
         new MockDBusThreadManager;
+    EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())
+        .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
 
     MockPowerManagerClient* power_manager =
         mock_dbus_thread_manager->mock_power_manager_client();
     EXPECT_CALL(*power_manager, HasObserver(_))
         .Times(AnyNumber())
         .WillRepeatedly(HasObserver(&observer_));
     EXPECT_CALL(*power_manager, AddObserver(_))
         .WillOnce(SaveArg<0>(&observer_));
     EXPECT_CALL(*power_manager, RemoveObserver(_))
@@ skipping 42 matching lines @@
 TEST_F(KioskModeScreensaverTest, CheckObserversAfterUserLogin) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SESSION_STARTED,
       content::Source<UserManager>(UserManager::Get()),
       content::NotificationService::NoDetails());
 
   EXPECT_FALSE(PowerManagerObserverRegistered());
 }
 
 }  // namespace chromeos