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

Unified Diff: chrome/common/chrome_paths.cc

Issue 12255017: Revert 182279 due to failure in CloudPolicyTest.FetchPolicyWithRotatedKey on ChromeOS Asan bots. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | net/tools/testserver/device_management.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
===================================================================
--- chrome/common/chrome_paths.cc (revision 182301)
+++ chrome/common/chrome_paths.cc (working copy)
@@ -93,17 +93,12 @@
#endif // defined(OS_LINUX)
#if defined(OS_CHROMEOS)
-
const char kDefaultAppOrderFileName[] =
#if defined(GOOGLE_CHROME_BUILD)
FILE_PATH_LITERAL("/usr/share/google-chrome/default_app_order.json");
#else
FILE_PATH_LITERAL("/usr/share/chromium/default_app_order.json");
#endif // defined(GOOGLE_CHROME_BUILD)
-
-const FilePath::CharType kDefaultUserPolicyKeysDir[] =
- FILE_PATH_LITERAL("/var/run/user_policy");
-
#endif // defined(OS_CHROMEOS)
} // namespace
@@ -410,9 +405,6 @@
case chrome::FILE_DEFAULT_APP_ORDER:
cur = base::FilePath(FILE_PATH_LITERAL(kDefaultAppOrderFileName));
break;
- case chrome::DIR_USER_POLICY_KEYS:
- cur = FilePath(kDefaultUserPolicyKeysDir);
- break;
#endif
// The following are only valid in the development environment, and
// will fail if executed from an installed executable (because the
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | net/tools/testserver/device_management.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698