Make GetWebKitRootDirFilePath return correct dir on Android.

webkit/support/webkit_support.cc

Index: webkit/support/webkit_support.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index ff3fd4025bc3e2afd2b9ef2d904fb2c0b2720094..252ac84f06d71ede73f2ff0d69b9561845488a5b 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -221,6 +221,10 @@ class WebPluginImplWithPageDelegate
 FilePath GetWebKitRootDirFilePath() {
   FilePath basePath;
   PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
+#if defined(OS_ANDROID)
+  // Local files are at file:///data/local/tmp/third_party/WebKit/ on Android.
+  return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
+#else

[tkent, 2012/06/14 04:23:39]

How about simply changing the following line like...

if
(file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"))))
{

?
We don't need to add #if defined(OS_ANDROID) in this case.

[Hao Zheng, 2012/06/18 04:34:04]

Good idea. Done.
On 2012/06/14 04:23:39, Kent Tamura wrote:

   if (file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("chrome")))) {
     // We're in a WebKit-in-chrome checkout.
     return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
@@ -236,6 +240,7 @@ FilePath GetWebKitRootDirFilePath() {
   // We're in a WebKit-only, make-build, so the DIR_SOURCE_ROOT is already the
   // WebKit root. That, or we have no idea where we are.
   return basePath;
+#endif
 }
 
 class WebKitClientMessageLoopImpl