Update the WebKit API used for WebSurroundingText.

With the update of the WebSurroundingText API and layout tests the currently
exposed initialize methods can be simplified into one. Update Chromium to allow
this happening without breaking the build.


BUG=125390
TEST=end to end Android UI tests, not ready to be upstreamed yet.


Review URL: https://chromiumcodereview.appspot.com/10736031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146154 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/android/content_detector.cc

@@ -5,6 +5,7 @@
 #include "content/renderer/android/content_detector.h"
 
 #include "base/logging.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHitTestResult.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSurroundingText.h"
 
@@ -33,7 +34,8 @@ WebRange ContentDetector::FindContentRange(
   // As the surrounding text extractor looks at maxLength/2 characters on
   // either side of the hit point, we need to double max content length here.
   WebSurroundingText surrounding_text;
-  surrounding_text.initialize(hit_test, GetMaximumContentLength() * 2);
+  surrounding_text.initialize(hit_test.node(), hit_test.localPoint(),
+                              GetMaximumContentLength() * 2);
   if (surrounding_text.isNull())
     return WebRange();