diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 05:39:01 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 05:39:01 +0000 |
| commit | f87c00c2e047e67864a2b66b26659d2a86c4a112 (patch) | |
| tree | c9b9f70af09ec17da9e1ddfce85f75c690f57f7e /chromeos/dbus/session_manager_client.h | |
| parent | 1ae2e642249ed8eb75a4d408214d21ff2afdff40 (diff) | |
| download | chromium_src-f87c00c2e047e67864a2b66b26659d2a86c4a112.zip chromium_src-f87c00c2e047e67864a2b66b26659d2a86c4a112.tar.gz chromium_src-f87c00c2e047e67864a2b66b26659d2a86c4a112.tar.bz2 | |
Revert of Enable Enterprise enrollment on desktop builds. (https://codereview.chromium.org/258743005/)
Reason for revert:
It seems to have broken the following test from
base_unittests and unit_tests on chromium.webkit Android Tests (dbg) builder:
PathServiceTest.Override
Log: http://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg%29/builds/18922
Snippet from log:
C 237s Main [FAIL] PathServiceTest.Override:
C 237s Main ../../base/path_service_unittest.cc:184: Failure
C 237s Main Value of: PathService::OverrideAndCreateIfNeeded(my_special_key,
non_existent, false, false)
C 237s Main Actual: true
C 237s Main Expected: false
Original issue's description:
> Enable Enterprise enrollment on desktop builds.
>
> This change implements some of the DBus stub methods so that enterprise enrollment works on desktop builds. That will make development of features that depend on enrollment faster for developers that use this workflow (e.g. for kiosk enterprise apps, public accounts, testing some device policies, etc).
>
> - Override some of the directories and files involved with the enrollment state
> - Simple stub implementation of the DBus calls involved
> - Write a persistent cache of the install attributes
> - Cleaned up the stub for user cloud policy and made them persistent too
> - Updated some tests
>
> This change doesn't affect production code.
>
> TBR=jochen@chromium.org
> BUG=240269, 367674
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267640
TBR=brettw@chromium.org,nkostylev@chromium.org,pastarmovj@chromium.org,satorux@chromium.org,jochen@chromium.org,joaodasilva@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=240269, 367674
Review URL: https://codereview.chromium.org/265013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/session_manager_client.h')
| -rw-r--r-- | chromeos/dbus/session_manager_client.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chromeos/dbus/session_manager_client.h b/chromeos/dbus/session_manager_client.h index 2a5792d..9e3ca89 100644 --- a/chromeos/dbus/session_manager_client.h +++ b/chromeos/dbus/session_manager_client.h @@ -156,8 +156,11 @@ class CHROMEOS_EXPORT SessionManagerClient : public DBusClient { // Attempts to asynchronously store |policy_blob| as user policy for the given // |username|. Upon completion of the store attempt, we will call callback. + // The |policy_key| argument is not sent to the session manager, but is used + // by the stub implementation to enable policy validation on desktop builds. virtual void StorePolicyForUser(const std::string& username, const std::string& policy_blob, + const std::string& policy_key, const StorePolicyCallback& callback) = 0; // Sends a request to store a policy blob for the specified device-local |