Deprecate PathService::Get(..., wstring*) and use FilePath instead.

base/base_paths_win.cc

 // Copyright (c) 2006-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/base_paths_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "base/file_path.h"
@@ skipping 84 matching lines @@
       break;
     case base::DIR_LOCAL_APP_DATA:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL,
                                  SHGFP_TYPE_CURRENT, system_buffer)))
         return false;
       cur = FilePath(system_buffer);
       break;
     case base::DIR_SOURCE_ROOT:
       // On Windows, unit tests execute two levels deep from the source root.
       // For example:  chrome/{Debug|Release}/ui_tests.exe
-      PathService::Get(base::DIR_EXE, &wstring_path);
-      file_util::UpOneDirectory(&wstring_path);
-      file_util::UpOneDirectory(&wstring_path);
-      cur = FilePath(wstring_path);
+      PathService::Get(base::DIR_EXE, &cur);
+      cur = cur.DirName().DirName();
       break;
     default:
       return false;
   }
 
   *result = cur;
   return true;
 }
 
 }  // namespace base