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

Unified Diff: chrome/browser/chromeos/policy/device_policy_cros_browser_test.h

Issue 16658015: Add device policies to control accessibility settings on the login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed leaky tests. Created 7 years, 6 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
diff --git a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
index 88961e6595de7dfdb831a8ea22194ffc85fb1bd6..a112f804659e628fcd320267f8fae503376c42ec 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -20,6 +20,12 @@ namespace policy {
// 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();
@@ -45,6 +51,9 @@ class DevicePolicyCrosBrowserTest :
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_;
@@ -52,9 +61,6 @@ class DevicePolicyCrosBrowserTest :
// Carries Chrome OS device policies for tests.
DevicePolicyBuilder device_policy_;
- // Stores the device owner key.
- base::ScopedTempDir temp_dir_;
-
DISALLOW_COPY_AND_ASSIGN(DevicePolicyCrosBrowserTest);
};

Powered by Google App Engine
This is Rietveld 408576698