diff options
| author | ricow@chromium.org <ricow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 07:37:44 +0000 |
|---|---|---|
| committer | ricow@chromium.org <ricow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 07:37:44 +0000 |
| commit | 71811bb2b9de51900927c3e82aeb779c6fcb798b (patch) | |
| tree | 63873967ec6771363eb71a2aec0b3eab71cee6d2 /chromeos | |
| parent | 880a5d27941d1c89e09bb743d426845950762dbc (diff) | |
| download | chromium_src-71811bb2b9de51900927c3e82aeb779c6fcb798b.zip chromium_src-71811bb2b9de51900927c3e82aeb779c6fcb798b.tar.gz chromium_src-71811bb2b9de51900927c3e82aeb779c6fcb798b.tar.bz2 | |
Revert 278518 "Wire up component cloud policy to device local ac..."
This is causing failures on Linux Chromium OS ASan LSan Tests (3), see
http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%283%29/builds/1905
> Wire up component cloud policy to device local accounts.
>
> This enables policy-for-extensions running in Public Sessions, and for
> extensions running as Kiosk Apps too.
>
> TBR=bartfab@chromium.org
> BUG=224596
>
> Review URL: https://codereview.chromium.org/341043005
TBR=joaodasilva@chromium.org
Review URL: https://codereview.chromium.org/343103005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_paths.cc | 15 | ||||
| -rw-r--r-- | chromeos/chromeos_paths.h | 5 |
2 files changed, 0 insertions, 20 deletions
diff --git a/chromeos/chromeos_paths.cc b/chromeos/chromeos_paths.cc index f629c45..a9963af 100644 --- a/chromeos/chromeos_paths.cc +++ b/chromeos/chromeos_paths.cc @@ -41,9 +41,6 @@ const base::FilePath::CharType kDeviceLocalAccountExtensionDir[] = const base::FilePath::CharType kDeviceLocalAccountExternalDataDir[] = FILE_PATH_LITERAL("/var/cache/device_local_account_external_policy_data"); -const base::FilePath::CharType kDeviceLocalAccountComponentPolicy[] = - FILE_PATH_LITERAL("/var/cache/device_local_account_component_policy"); - bool PathProvider(int key, base::FilePath* result) { switch (key) { case FILE_DEFAULT_APP_ORDER: @@ -70,9 +67,6 @@ bool PathProvider(int key, base::FilePath* result) { case DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA: *result = base::FilePath(kDeviceLocalAccountExternalDataDir); break; - case DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY: - *result = base::FilePath(kDeviceLocalAccountComponentPolicy); - break; default: return false; } @@ -105,15 +99,6 @@ void RegisterStubPathOverrides(const base::FilePath& stubs_dir) { parent.AppendASCII("stub_install_attributes.pb"), is_absolute, create); - PathService::Override( - DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS, - parent.AppendASCII("stub_device_local_account_extensions")); - PathService::Override( - DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA, - parent.AppendASCII("stub_device_local_account_external_data")); - PathService::Override( - DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY, - parent.AppendASCII("stub_device_local_account_component_policy")); } } // namespace chromeos diff --git a/chromeos/chromeos_paths.h b/chromeos/chromeos_paths.h index db55c27..fe9be13 100644 --- a/chromeos/chromeos_paths.h +++ b/chromeos/chromeos_paths.h @@ -38,11 +38,6 @@ enum { DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA, // Directory where external data // referenced by policies is cached // for device-local accounts. - DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY, // Directory where policy for the - // components of device-local - // account is stored. Currently - // this is used for policy for - // extensions. PATH_END }; |