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

ui/gl/gl_implementation_linux.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 <vector>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 void GL_BINDING_CALL MarshalClearDepthToClearDepthf(GLclampd depth) {
   glClearDepthf(static_cast<GLclampf>(depth));
 }
 
 void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
                                                     GLclampd z_far) {
   glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far));
 }
 
 // Load a library, printing an error message on failure.
-base::NativeLibrary LoadLibrary(const FilePath& filename) {
+base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
   std::string error;
   base::NativeLibrary library = base::LoadNativeLibrary(filename,
                                                         &error);
   if (!library) {
     DVLOG(1) << "Failed to load " << filename.MaybeAsASCII() << ": " << error;
     return NULL;
   }
   return library;
 }
 
 base::NativeLibrary LoadLibrary(const char* filename) {
-  return LoadLibrary(FilePath(filename));
+  return LoadLibrary(base::FilePath(filename));
 }
 
 }  // namespace
 
 void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
   impls->push_back(kGLImplementationDesktopGL);
   impls->push_back(kGLImplementationEGLGLES2);
   impls->push_back(kGLImplementationOSMesaGL);
 }
 
 bool InitializeGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
   // unit tests have initialized with kGLImplementationMock, we don't want to
   // later switch to another GL implementation.
   if (GetGLImplementation() != kGLImplementationNone)
     return true;
 
   // Allow the main thread or another to initialize these bindings
   // after instituting restrictions on I/O. Going forward they will
   // likely be used in the browser process on most platforms. The
   // one-time initialization cost is small, between 2 and 5 ms.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   switch (implementation) {
     case kGLImplementationOSMesaGL: {
-      FilePath module_path;
+      base::FilePath module_path;
       if (!PathService::Get(base::DIR_MODULE, &module_path)) {
         LOG(ERROR) << "PathService::Get failed.";
         return false;
       }
 
       base::NativeLibrary library = LoadLibrary(
           module_path.Append("libosmesa.so"));
       if (!library)
         return false;
 
@@ skipping 137 matching lines @@
   ClearGLBindingsEGL();
   ClearGLBindingsGL();
   ClearGLBindingsGLX();
   ClearGLBindingsOSMESA();
   SetGLImplementation(kGLImplementationNone);
 
   UnloadGLNativeLibraries();
 }
 
 }  // namespace gfx