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

ui/test/test_suite.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 "ui/test/test_suite.h"
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 24 matching lines @@
 #endif
 
   ui::RegisterPathProvider();
   gfx::RegisterPathProvider();
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   // Look in the framework bundle for resources.
   // TODO(port): make a resource bundle for non-app exes.  What's done here
   // isn't really right because this code needs to depend on chrome_dll
   // being built.  This is inappropriate in app.
-  FilePath path;
+  base::FilePath path;
   PathService::Get(base::DIR_EXE, &path);
 #if defined(GOOGLE_CHROME_BUILD)
   path = path.AppendASCII("Google Chrome Framework.framework");
 #elif defined(CHROMIUM_BUILD)
   path = path.AppendASCII("Chromium Framework.framework");
 #else
 #error Unknown branding
 #endif
   base::mac::SetOverrideFrameworkBundlePath(path);
 #elif defined(OS_POSIX)
-  FilePath pak_dir;
+  base::FilePath pak_dir;
 #if defined(OS_ANDROID)
   PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &pak_dir);
 #else
   PathService::Get(base::DIR_MODULE, &pak_dir);
   pak_dir = pak_dir.AppendASCII("ui_unittests_strings");
   PathService::Override(ui::DIR_LOCALES, pak_dir);
 #endif  // defined(OS_ANDROID)
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
   // Force unittests to run using en-US so if we test against string
@@ skipping 11 matching lines @@
   ui::ResourceBundle::CleanupSharedInstance();
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
   base::TestSuite::Shutdown();
 }
 
 }  // namespace test
 }  // namespace ui