Make GetWebKitRootDirFilePath smarter about where the WebKit root is relative to the chromium root

base/base_paths_win.cc

 // Copyright (c) 2011 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 99 matching lines @@
                                  SHGFP_TYPE_CURRENT, system_buffer)))
         return false;
       cur = FilePath(system_buffer);
       break;
     case base::DIR_SOURCE_ROOT: {
       FilePath executableDir;
       // 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, &executableDir);
       cur = executableDir.DirName().DirName();
-      FilePath checkedPath =
-          cur.Append(FILE_PATH_LITERAL("base/base_paths_win.cc"));
-      if (!file_util::PathExists(checkedPath)) {
-        // Check for WebKit-only checkout. Executable files are put into
-        // WebKit/WebKit/chromium/{Debug|Relese}, and we should return
-        // WebKit/WebKit/chromium.
-        cur = executableDir.DirName();
-      }
       break;
     }
     default:
       return false;
   }
 
   *result = cur;
   return true;
 }
 
 }  // namespace base