| Index: trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
|
| ===================================================================
|
| --- trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h (revision 207797)
|
| +++ trunk/src/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h (working copy)
|
| @@ -20,12 +20,6 @@
|
| // Used to test Device policy changes in Chrome OS.
|
| class DevicePolicyCrosBrowserTest :
|
| public chromeos::CrosInProcessBrowserTest {
|
| - public:
|
| - // Marks the device as enterprise-owned. Must be called to make device
|
| - // policies apply Chrome-wide. If this is not called, device policies will
|
| - // affect CrosSettings only.
|
| - static void MarkAsEnterpriseOwned(base::ScopedTempDir* temp_dir);
|
| -
|
| protected:
|
| DevicePolicyCrosBrowserTest();
|
| virtual ~DevicePolicyCrosBrowserTest();
|
| @@ -51,9 +45,6 @@
|
|
|
| DevicePolicyBuilder* device_policy() { return &device_policy_; }
|
|
|
| - // Stores the device owner key and the install attributes.
|
| - base::ScopedTempDir temp_dir_;
|
| -
|
| private:
|
| // MockDBusThreadManagerWithoutGMock uses FakeSessionManagerClient.
|
| chromeos::MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_;
|
| @@ -61,6 +52,9 @@
|
| // Carries Chrome OS device policies for tests.
|
| DevicePolicyBuilder device_policy_;
|
|
|
| + // Stores the device owner key.
|
| + base::ScopedTempDir temp_dir_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);
|
| };
|
|
|
|
|