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

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

Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 e6e90a9eedc2346dcb235823783ecd5c9f87b00d..ca5289775577da27dbceede23c2941c052959b22 100644
--- a/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
+++ b/chrome/browser/chromeos/policy/device_policy_cros_browser_test.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
#define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_POLICY_CROS_BROWSER_TEST_H_
+#include <string>
+
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "chrome/browser/chromeos/policy/device_policy_builder.h"
@@ -25,6 +27,7 @@ class DevicePolicyCrosTestHelper {
// 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 MarkAsEnterpriseOwnedBy(const std::string& user_name);
void MarkAsEnterpriseOwned();
// Writes the owner key to disk. To be called before installing a policy.
@@ -33,7 +36,7 @@ class DevicePolicyCrosTestHelper {
DevicePolicyBuilder* device_policy() { return &device_policy_; }
private:
- void OverridePaths();
+ static void OverridePaths();
// Carries Chrome OS device policies for tests.
DevicePolicyBuilder device_policy_;

Powered by Google App Engine
This is Rietveld 408576698