Move PathService's DIR_LAYOUT_TESTS from chrome to content

chrome/test/ui/ui_layout_test.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 "chrome/test/ui/ui_layout_test.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/chrome_paths.h"
+#include "content/public/common/content_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
 static const char kPlatformName[] = "chromium-win";
 #elif defined(OS_MACOSX)
 static const char kPlatformName[] = "chromium-mac";
 #elif defined(OS_LINUX)
 static const char kPlatformName[] = "chromium-linux";
@@ skipping 17 matching lines @@
     // To work around this problem, we try to repeat the deletion several
     // times.
     EXPECT_TRUE(file_util::DieFileDie(temp_test_dir_, true));
   }
 }
 
 void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
                                            const FilePath& test_case_dir,
                                            int port) {
   FilePath src_dir;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &src_dir));
+  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &src_dir));
   layout_test_dir_ = src_dir.Append(test_parent_dir);
   layout_test_dir_ = layout_test_dir_.Append(test_case_dir);
-  ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_));
+  ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_))
+      << " " << layout_test_dir_.value();
 
   // Gets the file path to rebased expected result directory for the current
   // platform.
   //   $LayoutTestRoot/platform/chromium_***/...
   rebase_result_dir_ = src_dir.AppendASCII("platform");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII(kPlatformName);
   rebase_result_dir_ = rebase_result_dir_.Append(test_parent_dir);
   rebase_result_dir_ = rebase_result_dir_.Append(test_case_dir);
 
   // Generic chromium expected results. Not OS-specific. For example,
@@ skipping 49 matching lines @@
     parent_resource_path = parent_resource_path.AppendASCII("resources");
     FilePath new_parent_resource_path(new_layout_test_dir_.DirName());
     new_parent_resource_path =
         new_parent_resource_path.AppendASCII("resources");
     ASSERT_TRUE(file_util::CopyDirectory(
         parent_resource_path, new_parent_resource_path, true));
   }
 
   // Reads the layout test controller simulation script.
   FilePath path;
-  PathService::Get(chrome::DIR_TEST_DATA, &path);
+  PathService::Get(content::DIR_TEST_DATA, &path);
   path = path.AppendASCII("layout_tests");
   path = path.AppendASCII("layout_test_controller.html");
   layout_test_controller_.clear();
   ASSERT_TRUE(file_util::ReadFileToString(path, &layout_test_controller_));
 }
 
 void UILayoutTest::AddResourceForLayoutTest(const FilePath& parent_dir,
                                             const FilePath& resource_name) {
   FilePath source;
-  ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &source));
+  ASSERT_TRUE(PathService::Get(content::DIR_LAYOUT_TESTS, &source));
   source = source.Append(parent_dir);
   source = source.Append(resource_name);
 
-  ASSERT_TRUE(file_util::PathExists(source));
+  ASSERT_TRUE(file_util::PathExists(source)) << " " << source.value();
 
   FilePath dest_parent_dir = temp_test_dir_.
       AppendASCII("LayoutTests").Append(parent_dir);
   ASSERT_TRUE(file_util::CreateDirectory(dest_parent_dir));
   FilePath dest = dest_parent_dir.Append(resource_name);
 
   if (file_util::DirectoryExists(source)) {
     ASSERT_TRUE(file_util::CopyDirectory(source, dest, true));
   } else {
     ASSERT_TRUE(file_util::CopyFile(source, dest));
@@ skipping 103 matching lines @@
                                       std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(expected_result_path,
                                      expected_result_value);
 }