Keep trying to undo 7564.

base/file_path_unittest.cc

 // Copyright (c) 2008 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/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 191 matching lines @@
     { FPL("c:\\aa"),        FPL("aa") },
     { FPL("c:\\aa\\"),      FPL("aa") },
     { FPL("c:\\aa\\bb"),    FPL("bb") },
     { FPL("c:aa\\bb"),      FPL("bb") },
 #endif  // FILE_PATH_USES_DRIVE_LETTERS
 #endif  // FILE_PATH_USES_WIN_SEPARATORS
   };
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath input(cases[i].input);
-    FilePath::StringType observed = input.BaseName();
-    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed) <<
+    FilePath observed = input.BaseName();
+    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed.value()) <<
               "i: " << i << ", input: " << input.value();
   }
 }
 
 TEST_F(FilePathTest, Append) {
   const struct BinaryTestData cases[] = {
     { { FPL(""),           FPL("cc") }, FPL("cc") },
     { { FPL("."),          FPL("ff") }, FPL("ff") },
     { { FPL("/"),          FPL("cc") }, FPL("/cc") },
     { { FPL("/aa"),        FPL("") },   FPL("/aa") },
@@ skipping 175 matching lines @@
       FilePath(foo.value() + FILE_PATH_LITERAL("/bar.txt"))));
 #elif defined(OS_LINUX)
   EXPECT_FALSE(foo.Contains(foo_caps.Append(FILE_PATH_LITERAL("bar.txt"))));
 #else
   // We can't really do this test on osx since the case-sensitivity of the
   // filesystem is configurable.
 #endif
 
   // Note: whether 
 }