Revert 171544

cc/layer_tree_host_perftest.cc

 // Copyright 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 "cc/layer_tree_host.h"
 
+#include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "cc/content_layer.h"
 #include "cc/nine_patch_layer.h"
 #include "cc/solid_color_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_test_common.h"
-#include "cc/test/paths.h"
 
 namespace cc {
 namespace {
 
 static const int kTimeLimitMillis = 2000;
 
 class LayerTreeHostPerfTest : public WebKitTests::ThreadedTest {
  public:
   LayerTreeHostPerfTest()
       : num_draws_(0) {
@@ skipping 205 matching lines @@
 }
 
 class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
  public:
   LayerTreeHostPerfTestJsonReader()
       : LayerTreeHostPerfTest() {
   }
 
   void readTestFile(std::string name) {
     test_name_ = name;
-    FilePath test_data_dir;
-    ASSERT_TRUE(PathService::Get(cc::test::DIR_TEST_DATA, &test_data_dir));
-    FilePath json_file = test_data_dir.AppendASCII(name + ".json");
+    FilePath filepath;
+    ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &filepath));
+    filepath = filepath.AppendASCII("cc").AppendASCII("test")
+                       .AppendASCII("data").AppendASCII(name + ".json");
     std::string json;
-    ASSERT_TRUE(file_util::ReadFileToString(json_file, &json));
+    ASSERT_TRUE(file_util::ReadFileToString(filepath, &json));
     tree_.reset(base::JSONReader::Read(json));
     ASSERT_TRUE(tree_);
   }
 
   scoped_refptr<Layer> parseLayer(base::Value* val) {
     DictionaryValue* dict;
     bool success = true;
     success &= val->GetAsDictionary(&dict);
     std::string layer_type;
     success &= dict->GetString("LayerType", &layer_type);
@@ skipping 59 matching lines @@
   scoped_ptr<base::Value> tree_;
 };
 
 TEST_F(LayerTreeHostPerfTestJsonReader, tenTenSingleThread) {
   readTestFile("10_10_layer_tree");
   runTest(false);
 }
 
 }  // namespace
 }  // namespace cc