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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.cc ('k') | chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc » ('j') | chrome/common/chrome_paths.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 2febb1a5b5a2118670f95a929e07fb7ae96314f3..7b6491b42421d75ba04f7e92eba18394c01cf2ba 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -40,6 +40,7 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
#include "chrome/common/chrome_paths.h"
+#include "chromeos/chromeos_paths.h"
#include "chromeos/dbus/mock_cryptohome_client.h"
#include "chromeos/dbus/mock_dbus_thread_manager.h"
#include "chromeos/dbus/mock_session_manager_client.h"
@@ -183,7 +184,8 @@ class CloudPolicyTest : public InProcessBrowserTest {
command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
#if defined(OS_CHROMEOS)
- PathService::Override(chrome::DIR_USER_POLICY_KEYS, user_policy_key_dir());
+ ASSERT_TRUE(PathService::Override(chromeos::DIR_USER_POLICY_KEYS,
+ user_policy_key_dir()));
mock_dbus_thread_manager_ = new chromeos::MockDBusThreadManager();
chromeos::DBusThreadManager::InitializeForTesting(
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.cc ('k') | chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc » ('j') | chrome/common/chrome_paths.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698