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

ui/base/text/text_elider_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.
 //
 // Unit tests for eliding and formatting utility functions.
 
 #include "ui/base/text/text_elider.h"
 
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/font.h"
 
 namespace ui {
 
 namespace {
 
 struct Testcase {
   const std::string input;
   const std::string output;
 };
 
 struct FileTestcase {
-  const FilePath::StringType input;
+  const base::FilePath::StringType input;
   const std::string output;
 };
 
 struct UTF16Testcase {
   const string16 input;
   const string16 output;
 };
 
 struct TestData {
   const std::string a;
@@ skipping 217 matching lines @@
 
 // TODO(ios): Complex eliding is off by one for some of those tests on iOS.
 // See crbug.com/154019
 #if defined(OS_IOS)
 #define MAYBE_TestFilenameEliding DISABLED_TestFilenameEliding
 #else
 #define MAYBE_TestFilenameEliding TestFilenameEliding
 #endif
 TEST(TextEliderTest, MAYBE_TestFilenameEliding) {
   const std::string kEllipsisStr(kEllipsis);
-  const FilePath::StringType kPathSeparator =
-      FilePath::StringType().append(1, FilePath::kSeparators[0]);
+  const base::FilePath::StringType kPathSeparator =
+      base::FilePath::StringType().append(1, base::FilePath::kSeparators[0]);
 
   FileTestcase testcases[] = {
     {FILE_PATH_LITERAL(""), ""},
     {FILE_PATH_LITERAL("."), "."},
     {FILE_PATH_LITERAL("filename.exe"), "filename.exe"},
     {FILE_PATH_LITERAL(".longext"), ".longext"},
     {FILE_PATH_LITERAL("pie"), "pie"},
     {FILE_PATH_LITERAL("c:") + kPathSeparator + FILE_PATH_LITERAL("path") +
       kPathSeparator + FILE_PATH_LITERAL("filename.pie"),
       "filename.pie"},
@@ skipping 17 matching lines @@
     {FILE_PATH_LITERAL("filename.superduperextremelylongext"),
       "filename.sup" + kEllipsisStr + "emelylongext"},
     {FILE_PATH_LITERAL("filenamereallylongtext.superduperextremelylongext"),
       "filenamereall" + kEllipsisStr + "emelylongext"},
     {FILE_PATH_LITERAL("file.name.really.long.text.superduperextremelylongext"),
       "file.name.re" + kEllipsisStr + "emelylongext"}
   };
 
   static const gfx::Font font;
   for (size_t i = 0; i < arraysize(testcases); ++i) {
-    FilePath filepath(testcases[i].input);
+    base::FilePath filepath(testcases[i].input);
     string16 expected = UTF8ToUTF16(testcases[i].output);
     expected = base::i18n::GetDisplayStringInLTRDirectionality(expected);
     EXPECT_EQ(expected, ElideFilename(filepath,
         font,
         font.GetStringWidth(UTF8ToUTF16(testcases[i].output))));
   }
 }
 
 TEST(TextEliderTest, ElideTextTruncate) {
   const gfx::Font font;
@@ skipping 573 matching lines @@
 
   // Test adds ... at right spot when there is not enough room to break at a
   // word boundary.
   EXPECT_EQ(L"foooooey\x2026", UTF16ToWide(TruncateString(string, 11)));
 
   // Test completely truncates string if break is on initial whitespace.
   EXPECT_EQ(L"\x2026", UTF16ToWide(TruncateString(ASCIIToUTF16("   "), 2)));
 }
 
 }  // namespace ui