Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc.

chrome/browser/policy/cloud/cloud_policy_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 22 matching lines @@
 #include "policy/policy_constants.h"
 #include "policy/proto/chrome_settings.pb.h"
 #include "policy/proto/cloud_policy.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #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"
 #include "chromeos/dbus/mock_update_engine_client.h"
 #else
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #endif
@@ skipping 123 matching lines @@
 
     test_server_.reset(new LocalPolicyTestServer(policy_file_path()));
     ASSERT_TRUE(test_server_->Start());
 
     std::string url = test_server_->GetServiceURL().spec();
 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     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(
         mock_dbus_thread_manager_);
     EXPECT_CALL(*mock_dbus_thread_manager_->mock_cryptohome_client(),
                 GetSanitizedUsername(_, _))
         .WillRepeatedly(GetSanitizedUsername());
     EXPECT_CALL(*mock_dbus_thread_manager_->mock_session_manager_client(),
                 StoreUserPolicy(_, _))
         .WillRepeatedly(StoreUserPolicy(&session_manager_user_policy_,
@@ skipping 203 matching lines @@
 
   // They should now serialize to the same bytes.
   std::string chrome_settings_serialized;
   std::string cloud_policy_serialized;
   ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
   ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
   EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
 }
 
 }  // namespace policy