Fixes for handling of MockDBusThreadManager::GetSystemBus().

chrome/browser/chromeos/settings/signed_settings_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/settings/signed_settings.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 100 matching lines @@
         file_thread_(BrowserThread::FILE),
         mock_(new MockKeyUtils),
         injector_(mock_) /* injector_ takes ownership of mock_ */,
         mock_dbus_thread_manager_(new MockDBusThreadManager) {
   }
 
   virtual ~SignedSettingsTest() {}
 
   virtual void SetUp() {
     file_thread_.Start();
+    EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())

[satorux1, 2012/08/11 23:00:07]

mock_dbus_thread_manager -> mock_dbus_thread_manager_

+        .WillRepeatedly(Return(NULL));
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
   }
 
   virtual void TearDown() {
     OwnerKeyUtils::set_factory(NULL);
     DBusThreadManager::Shutdown();
   }
 
   void mock_service(SignedSettings* s, MockOwnershipService* m) {
     s->set_service(m);
@@ skipping 258 matching lines @@
       .Times(1);
 
   s->Execute();
   message_loop_.RunAllPending();
 
   s->OnKeyOpComplete(OwnerManager::OPERATION_FAILED, std::vector<uint8>());
   message_loop_.RunAllPending();
 }
 
 }  // namespace chromeos