Make GetWebKitRootDirFilePath return correct dir on Android.

webkit/support/webkit_support.cc

 // Copyright (c) 2012 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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 203 matching lines @@
       : webkit_support::TestWebPluginPageDelegate(),
         webkit::npapi::WebPluginImpl(frame, params, path, AsWeakPtr()) {}
   virtual ~WebPluginImplWithPageDelegate() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(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"));
   } else if (file_util::PathExists(
                  basePath.Append(FILE_PATH_LITERAL("chromium")))) {
     // We're in a WebKit-only checkout on Windows.
     return basePath.Append(FILE_PATH_LITERAL("../.."));
   } else if (file_util::PathExists(
                  basePath.Append(FILE_PATH_LITERAL("webkit/support")))) {
     // We're in a WebKit-only/xcodebuild checkout on Mac
     return basePath.Append(FILE_PATH_LITERAL("../../.."));
   }
   // 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
     : public WebDevToolsAgentClient::WebKitClientMessageLoop {
  public:
   WebKitClientMessageLoopImpl() : message_loop_(MessageLoop::current()) {}
   virtual ~WebKitClientMessageLoopImpl() {
     message_loop_ = NULL;
   }
   virtual void run() {
@@ skipping 532 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support