summaryrefslogtreecommitdiffstats
path: root/chromeos/chromeos_paths.cc
diff options
context:
space:
mode:
authorfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 05:39:01 +0000
committerfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 05:39:01 +0000
commitf87c00c2e047e67864a2b66b26659d2a86c4a112 (patch)
treec9b9f70af09ec17da9e1ddfce85f75c690f57f7e /chromeos/chromeos_paths.cc
parent1ae2e642249ed8eb75a4d408214d21ff2afdff40 (diff)
downloadchromium_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/chromeos_paths.cc')
-rw-r--r--chromeos/chromeos_paths.cc24
1 files changed, 0 insertions, 24 deletions
diff --git a/chromeos/chromeos_paths.cc b/chromeos/chromeos_paths.cc
index a9963af..25174d45 100644
--- a/chromeos/chromeos_paths.cc
+++ b/chromeos/chromeos_paths.cc
@@ -4,10 +4,8 @@
#include "chromeos/chromeos_paths.h"
-#include "base/file_util.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
-#include "base/sys_info.h"
namespace chromeos {
@@ -79,26 +77,4 @@ void RegisterPathProvider() {
PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
}
-void RegisterStubPathOverrides(const base::FilePath& stubs_dir) {
- CHECK(!base::SysInfo::IsRunningOnChromeOS());
- // Override these paths on the desktop, so that enrollment and cloud
- // policy work and can be tested.
- base::FilePath parent = base::MakeAbsoluteFilePath(stubs_dir);
- PathService::Override(
- DIR_USER_POLICY_KEYS,
- parent.AppendASCII("stub_user_policy"));
- const bool is_absolute = true;
- const bool create = false;
- PathService::OverrideAndCreateIfNeeded(
- FILE_OWNER_KEY,
- parent.AppendASCII("stub_owner.key"),
- is_absolute,
- create);
- PathService::OverrideAndCreateIfNeeded(
- FILE_INSTALL_ATTRIBUTES,
- parent.AppendASCII("stub_install_attributes.pb"),
- is_absolute,
- create);
-}
-
} // namespace chromeos