OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 5 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 ASSERT_EQ( | 65 ASSERT_EQ( |
66 file_util::WriteFile( | 66 file_util::WriteFile( |
67 owner_key_file, | 67 owner_key_file, |
68 reinterpret_cast<const char*>(vector_as_array(&owner_key_bits)), | 68 reinterpret_cast<const char*>(vector_as_array(&owner_key_bits)), |
69 owner_key_bits.size()), | 69 owner_key_bits.size()), |
70 static_cast<int>(owner_key_bits.size())); | 70 static_cast<int>(owner_key_bits.size())); |
71 ASSERT_TRUE(PathService::Override(chromeos::FILE_OWNER_KEY, owner_key_file)); | 71 ASSERT_TRUE(PathService::Override(chromeos::FILE_OWNER_KEY, owner_key_file)); |
72 } | 72 } |
73 | 73 |
74 DevicePolicyCrosBrowserTest::DevicePolicyCrosBrowserTest() | 74 DevicePolicyCrosBrowserTest::DevicePolicyCrosBrowserTest() |
75 : fake_dbus_thread_manager_( | 75 : fake_dbus_thread_manager_(new chromeos::FakeDBusThreadManager), |
76 new chromeos::FakeDBusThreadManager) { | 76 fake_session_manager_client_(new chromeos::FakeSessionManagerClient) { |
| 77 fake_dbus_thread_manager_->SetSessionManagerClient( |
| 78 scoped_ptr<chromeos::SessionManagerClient>(fake_session_manager_client_)); |
77 } | 79 } |
78 | 80 |
79 DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() { | 81 DevicePolicyCrosBrowserTest::~DevicePolicyCrosBrowserTest() { |
80 } | 82 } |
81 | 83 |
82 void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() { | 84 void DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture() { |
83 chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); | 85 chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager_); |
84 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 86 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
85 } | 87 } |
86 | 88 |
(...skipping 12 matching lines...) Expand all Loading... |
99 | 101 |
100 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() { | 102 void DevicePolicyCrosBrowserTest::RefreshDevicePolicy() { |
101 // Reset the key to its original state. | 103 // Reset the key to its original state. |
102 device_policy()->SetDefaultSigningKey(); | 104 device_policy()->SetDefaultSigningKey(); |
103 device_policy()->Build(); | 105 device_policy()->Build(); |
104 session_manager_client()->set_device_policy(device_policy()->GetBlob()); | 106 session_manager_client()->set_device_policy(device_policy()->GetBlob()); |
105 session_manager_client()->OnPropertyChangeComplete(true); | 107 session_manager_client()->OnPropertyChangeComplete(true); |
106 } | 108 } |
107 | 109 |
108 } // namespace policy | 110 } // namespace policy |
OLD | NEW |