Replace FilePath with base::FilePath in some more top level directories.

ui/compositor/layer_unittest.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
@@ skipping 122 matching lines @@
   void RunPendingMessages() {
     MessageLoopForUI::current()->RunUntilIdle();
   }
 
   // Invalidates the entire contents of the layer.
   void SchedulePaintForLayer(Layer* layer) {
     layer->SchedulePaint(
         gfx::Rect(0, 0, layer->bounds().width(), layer->bounds().height()));
   }
 
-  const FilePath& test_data_directory() const { return test_data_directory_; }
+  const base::FilePath& test_data_directory() const {
+    return test_data_directory_;
+  }
 
  private:
   scoped_ptr<TestCompositorHost> window_;
 
   // The root directory for test files.
-  FilePath test_data_directory_;
+  base::FilePath test_data_directory_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerWithRealCompositorTest);
 };
 
 // LayerDelegate that paints colors to the layer.
 class TestLayerDelegate : public LayerDelegate {
  public:
   explicit TestLayerDelegate() { reset(); }
   virtual ~TestLayerDelegate() {}
 
@@ skipping 725 matching lines @@
   //  +-l12
   scoped_ptr<Layer> l0(CreateColorLayer(SK_ColorRED,
                                         gfx::Rect(0, 0, 50, 50)));
   scoped_ptr<Layer> l11(CreateColorLayer(SK_ColorGREEN,
                                          gfx::Rect(0, 0, 25, 25)));
   scoped_ptr<Layer> l21(CreateColorLayer(SK_ColorMAGENTA,
                                          gfx::Rect(0, 0, 15, 15)));
   scoped_ptr<Layer> l12(CreateColorLayer(SK_ColorBLUE,
                                          gfx::Rect(10, 10, 25, 25)));
 
-  FilePath ref_img1 = test_data_directory().AppendASCII("ModifyHierarchy1.png");
-  FilePath ref_img2 = test_data_directory().AppendASCII("ModifyHierarchy2.png");
+  base::FilePath ref_img1 =
+      test_data_directory().AppendASCII("ModifyHierarchy1.png");
+  base::FilePath ref_img2 =
+      test_data_directory().AppendASCII("ModifyHierarchy2.png");
   SkBitmap bitmap;
 
   l0->Add(l11.get());
   l11->Add(l21.get());
   l0->Add(l12.get());
   DrawTree(l0.get());
   ASSERT_TRUE(ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
   // WritePNGFile(bitmap, ref_img1);
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img1));
@@ skipping 32 matching lines @@
 TEST_F(LayerWithRealCompositorTest, MAYBE_Opacity) {
   GetCompositor()->SetScaleAndSize(1.0f, gfx::Size(50, 50));
 
   // l0
   //  +-l11
   scoped_ptr<Layer> l0(CreateColorLayer(SK_ColorRED,
                                         gfx::Rect(0, 0, 50, 50)));
   scoped_ptr<Layer> l11(CreateColorLayer(SK_ColorGREEN,
                                          gfx::Rect(0, 0, 25, 25)));
 
-  FilePath ref_img = test_data_directory().AppendASCII("Opacity.png");
+  base::FilePath ref_img = test_data_directory().AppendASCII("Opacity.png");
 
   l11->SetOpacity(0.75);
   l0->Add(l11.get());
   DrawTree(l0.get());
   SkBitmap bitmap;
   ASSERT_TRUE(ReadPixels(&bitmap));
   ASSERT_FALSE(bitmap.empty());
   // WritePNGFile(bitmap, ref_img);
   EXPECT_TRUE(IsSameAsPNGFile(bitmap, ref_img));
 }
@@ skipping 279 matching lines @@
 
   // Resize layer.
   child->SetBounds(gfx::Rect(200, 200, 400, 400));
   child->SetVisible(true);
   EXPECT_TRUE(schedule_draw_invoked_);
   DrawTree(root.get());
   EXPECT_TRUE(delegate.painted());
 }
 
 }  // namespace ui