Unbreak unit tests. Revert r7564.

tbr=jhawkins

Review URL: http://codereview.chromium.org/16522

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7571 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 345e1b89c38bf19ebce483ae5392474bbf63ae59
diff --git a/base/file_path_unittest.cc b/base/file_path_unittest.cc
index b4ad16f..37fd41a 100644
--- a/base/file_path_unittest.cc
+++ b/base/file_path_unittest.cc
@@ -209,8 +209,8 @@
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     FilePath input(cases[i].input);
-    FilePath observed = input.BaseName();
-    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed.value()) <<
+    FilePath::StringType observed = input.BaseName();
+    EXPECT_EQ(FilePath::StringType(cases[i].expected), observed) <<
               "i: " << i << ", input: " << input.value();
   }
 }