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

chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc

 // Copyright (c) 2013 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 <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.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/chromeos_switches.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"
@@ skipping 105 matching lines @@
     std::string url = test_server_.GetServiceURL().spec();
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
     command_line->AppendSwitch(switches::kEnableComponentCloudPolicy);
 
 #if defined(OS_CHROMEOS)
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath user_key_path =
         temp_dir_.path().AppendASCII(kSanitizedUsername)
                         .AppendASCII("policy.pub");
-    PathService::Override(chrome::DIR_USER_POLICY_KEYS, temp_dir_.path());
+    ASSERT_TRUE(PathService::Override(chromeos::DIR_USER_POLICY_KEYS,
+                                      temp_dir_.path()));
 
     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 143 matching lines @@
   ASSERT_EQ(kTestExtension2, extension2->id());
 
   // This extension only sends the 'policy' signal once it receives the policy,
   // and after verifying it has the expected value. Otherwise it sends 'fail'.
   EXPECT_TRUE(result_listener.WaitUntilSatisfied());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace policy