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

Unified Diff: cc/layer_tree_host_perftest.cc

Issue 11412289: Basic pixel tests for cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix AtExitManager registration stuff Created 8 years 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 | « cc/gl_renderer_pixeltest.cc ('k') | cc/test/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_perftest.cc
diff --git a/cc/layer_tree_host_perftest.cc b/cc/layer_tree_host_perftest.cc
index d72c1bd4de9aa8e0de2c8572d541f222c5ae9b8d..ca7031d13fa9b6b852e294f13af8656d2116467c 100644
--- a/cc/layer_tree_host_perftest.cc
+++ b/cc/layer_tree_host_perftest.cc
@@ -4,7 +4,6 @@
#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"
@@ -15,6 +14,7 @@
#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 {
@@ -240,12 +240,11 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
void readTestFile(std::string name) {
test_name_ = name;
- FilePath filepath;
- ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &filepath));
- filepath = filepath.AppendASCII("cc").AppendASCII("test")
- .AppendASCII("data").AppendASCII(name + ".json");
+ 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");
std::string json;
- ASSERT_TRUE(file_util::ReadFileToString(filepath, &json));
+ ASSERT_TRUE(file_util::ReadFileToString(json_file, &json));
tree_.reset(base::JSONReader::Read(json));
ASSERT_TRUE(tree_);
}
« no previous file with comments | « cc/gl_renderer_pixeltest.cc ('k') | cc/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698