Revert wstring patch (r29078 and follow up commits). It is causing failures o...

chrome/browser/tab_contents/navigation_controller_unittest.cc

 // Copyright (c) 2009 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/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/history/history.h"
@@ skipping 70 matching lines @@
         profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
     if (history) {
       history->SetOnBackendDestroyTask(new MessageLoop::QuitTask);
       MessageLoop::current()->Run();
     }
 
     // Do normal cleanup before deleting the profile directory below.
     NavigationControllerTest::TearDown();
 
     ASSERT_TRUE(file_util::Delete(test_dir_, true));
-    ASSERT_FALSE(file_util::PathExists(FilePath::FromWStringHack(test_dir_)));
+    ASSERT_FALSE(file_util::PathExists(test_dir_));
   }
 
   // Deletes the current profile manager and creates a new one. Indirectly this
   // shuts down the history database and reopens it.
   void ReopenDatabase() {
     session_helper_.set_service(NULL);
     profile()->set_session_service(NULL);
 
     SessionService* service = new SessionService(profile());
     profile()->set_session_service(service);
@@ skipping 1406 matching lines @@
   TabNavigation nav(0, url0, GURL(), string16(),
                     webkit_glue::CreateHistoryStateForURL(url0),
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */