summaryrefslogtreecommitdiffstats
path: root/cc/trees/layer_tree_host_perftest.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 23:05:01 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 23:05:01 +0000
commite51444acccf0aeeeed78d0a9795016e26013e1a1 (patch)
tree358fba3fd6a996a2de9814bd5fd78ab204b5cd7a /cc/trees/layer_tree_host_perftest.cc
parenta269ade545f74e075b8fff7ca5b7f2edf32369d0 (diff)
downloadchromium_src-e51444acccf0aeeeed78d0a9795016e26013e1a1.zip
chromium_src-e51444acccf0aeeeed78d0a9795016e26013e1a1.tar.gz
chromium_src-e51444acccf0aeeeed78d0a9795016e26013e1a1.tar.bz2
cc: Add PRESUBMIT rule to ban using cc:: inside of namespace cc {...}
This also makes cc/ PRESUBMIT clean for the new check. The most invasive changes were: 1. Moving the cc/test/paths.h enum into a CCPaths class (named with CC prefix to clarify this path is for CC since the enum is extending an enum from base/. 2. Merge ResourcePool::Resource up into ScopedResource which was the same thing basically. R=enne BUG= Review URL: https://codereview.chromium.org/109263003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_perftest.cc')
-rw-r--r--cc/trees/layer_tree_host_perftest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 4fd2436..e3cf1f7 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -124,7 +124,7 @@ class LayerTreeHostPerfTestJsonReader : public LayerTreeHostPerfTest {
void ReadTestFile(const std::string& name) {
base::FilePath test_data_dir;
- ASSERT_TRUE(PathService::Get(cc::DIR_TEST_DATA, &test_data_dir));
+ ASSERT_TRUE(PathService::Get(CCPaths::DIR_TEST_DATA, &test_data_dir));
base::FilePath json_file = test_data_dir.AppendASCII(name + ".json");
ASSERT_TRUE(base::ReadFileToString(json_file, &json_));
}