Fixes for handling of MockDBusThreadManager::GetSystemBus().

chrome/browser/chromeos/settings/signed_settings_helper_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_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/mock_owner_key_utils.h"
 #include "chrome/browser/chromeos/settings/mock_ownership_service.h"
 #include "chrome/browser/chromeos/settings/owner_manager.h"
 #include "chrome/browser/chromeos/settings/signed_settings.h"
 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "chromeos/dbus/mock_session_manager_client.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::A;
 using ::testing::InSequence;
 using ::testing::Invoke;
+using ::testing::Return;
 using ::testing::WithArg;
 
 namespace em = enterprise_management;
 namespace chromeos {
 
 ACTION_P(Retrieve, policy_blob) { arg0.Run(policy_blob); }
 ACTION_P(Store, success) { arg1.Run(success); }
 
 class SignedSettingsHelperTest : public testing::Test,
                                  public SignedSettingsHelper::TestDelegate {
  public:
   SignedSettingsHelperTest()
       : message_loop_(MessageLoop::TYPE_UI),
         ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_),
         pending_ops_(0),
         mock_dbus_thread_manager_(new MockDBusThreadManager) {
   }
 
   virtual void SetUp() {
     SignedSettingsHelper::Get()->set_test_delegate(this);
+    EXPECT_CALL(*mock_dbus_thread_manager_, GetSystemBus())
+        .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
 
     fake_policy_data_ = BuildPolicyData();
     std::string data_serialized = fake_policy_data_.SerializeAsString();
     std::string serialized_policy_;
     fake_policy_ = BuildProto(data_serialized,
                               std::string("false"),
                               &serialized_policy_);
 
     MockSessionManagerClient* client =
@@ skipping 141 matching lines @@
                  base::Unretained(&cb)));
   SignedSettingsHelper::Get()->StartRetrievePolicyOp(
       base::Bind(&MockSignedSettingsCallbacks::OnRetrievePolicyCompleted,
                  base::Unretained(&cb)));
 
   message_loop_.RunAllPending();
   ASSERT_EQ(0, pending_ops_);
 }
 
 }  // namespace chromeos