cc: Unify namespaces for all test files

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/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 88 matching lines @@
 
   scoped_refptr<Layer> addChild(scoped_refptr<Layer> parent, scoped_refptr<Layer> child) {
     parent->addChild(child);
     return child;
   }
 
  protected:
   base::TimeTicks start_time_;
   int num_draws_;
   std::string test_name_;
-  WebKitTests::FakeContentLayerClient fake_delegate_;
+  FakeContentLayerClient fake_delegate_;
 };
 
 class LayerTreeHostPerfTestSevenTabSwitcher : public LayerTreeHostPerfTest {
  public:
   LayerTreeHostPerfTestSevenTabSwitcher()
       : LayerTreeHostPerfTest() {
     test_name_ = "SevenTabSwitcher";
   }
 
   virtual void buildTree() OVERRIDE {
@@ skipping 114 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));
+    ASSERT_TRUE(PathService::Get(cc::DIR_TEST_DATA, &test_data_dir));
     FilePath json_file = test_data_dir.AppendASCII(name + ".json");
     std::string json;
     ASSERT_TRUE(file_util::ReadFileToString(json_file, &json));
     tree_.reset(base::JSONReader::Read(json));
     ASSERT_TRUE(tree_);
   }
 
   scoped_refptr<Layer> parseLayer(base::Value* val) {
     DictionaryValue* dict;
     bool success = true;
@@ skipping 70 matching lines @@
   scoped_ptr<base::Value> tree_;
 };
 
 TEST_F(LayerTreeHostPerfTestJsonReader, tenTenSingleThread) {
   readTestFile("10_10_layer_tree");
   runTest(false);
 }
 
 }  // namespace
 }  // namespace cc