Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Side by Side Diff: chrome/browser/chromeos/policy/device_policy_cros_browser_test.h

Issue 49773003: ChromeOS: Remove MockDBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 // Reinstalls |device_policy_| as the policy (to be used when it was 63 // Reinstalls |device_policy_| as the policy (to be used when it was
64 // recently changed). 64 // recently changed).
65 void RefreshDevicePolicy(); 65 void RefreshDevicePolicy();
66 66
67 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager() { 67 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager() {
68 return fake_dbus_thread_manager_; 68 return fake_dbus_thread_manager_;
69 } 69 }
70 70
71 chromeos::FakeSessionManagerClient* session_manager_client() { 71 chromeos::FakeSessionManagerClient* session_manager_client() {
72 return fake_dbus_thread_manager_->fake_session_manager_client(); 72 return fake_session_manager_client_;
73 } 73 }
74 74
75 DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); } 75 DevicePolicyBuilder* device_policy() { return test_helper_.device_policy(); }
76 76
77 private: 77 private:
78 DevicePolicyCrosTestHelper test_helper_; 78 DevicePolicyCrosTestHelper test_helper_;
79 79
80 // FakeDBusThreadManager uses FakeSessionManagerClient. 80 // FakeDBusThreadManager uses FakeSessionManagerClient.
81 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_; 81 chromeos::FakeDBusThreadManager* fake_dbus_thread_manager_;
82 chromeos::FakeSessionManagerClient* fake_session_manager_client_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest); 84 DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);
84 }; 85 };
85 86
86 } // namespace policy 87 } // namespace policy
87 88
88 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_ 89 #endif // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698