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

base/base_paths_mac.mm

 // 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_mac.h"
 
 #include <dlfcn.h>
 #import <Foundation/Foundation.h>
 #include <mach-o/dyld.h>
 
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 
 namespace {
+// The name of this file relative to the source root. This is used for checking
+// that the source checkout is in the correct place.
+static const char kThisSourceFile[] = "base/base_paths_mac.mm";
 
 void GetNSExecutablePath(FilePath* path) {
   DCHECK(path);
   // Executable path can have relative references ("..") depending on
   // how the app was launched.
   uint32_t executable_length = 0;
   _NSGetExecutablePath(NULL, &executable_length);
   DCHECK_GT(executable_length, 1u);
   std::string executable_path;
   int rv = _NSGetExecutablePath(WriteInto(&executable_path, executable_length),
@@ skipping 41 matching lines @@
       if (base::mac::AmIBundled()) {
         // The bundled app executables (Chromium, TestShell, etc) live five
         // levels down, eg:
         // src/xcodebuild/{Debug|Release}/Chromium.app/Contents/MacOS/Chromium
         *result = result->DirName().DirName().DirName().DirName().DirName();
       } else {
         // Unit tests execute two levels deep from the source root, eg:
         // src/xcodebuild/{Debug|Release}/base_unittests
         *result = result->DirName().DirName();
       }
+      // In a case of a WebKit-only checkout, using make instead of
+      // xcodebuild, we should return <root of
+      // checkout>/Source/WebKit/chromium.
+      // FIXME(thakis): try to move the xcodebuild directory up two levels.

[Nico, 2012/01/19 16:06:49]

s/FIXME/TODO

[jochen (gone - plz use gerrit), 2012/01/19 16:31:20]

Done.

+      // http://crbug.com/110455
+      if (!file_util::PathExists(result->Append(kThisSourceFile)))
+        *result = result->Append("Source/WebKit/chromium");

[Nico, 2012/01/19 16:06:49]

CHECK(file_util::PAthExists(result->Append(kThisSourceFile))

[jochen (gone - plz use gerrit), 2012/01/19 16:31:20]

Done.

       return true;
     }
     default:
       return false;
   }
 }
 
 }  // namespace base