Client-based geolocation support.

webkit/tools/test_shell/test_webview_delegate.h

Index: webkit/tools/test_shell/test_webview_delegate.h
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 3c7f38d419a28374b5aa4386c85c3445eb7812a9..f5d81ad23bfb8c60f3a1147d5149f261bef0af35 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -141,7 +141,11 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   virtual void focusAccessibilityObject(
       const WebKit::WebAccessibilityObject& object);
   virtual WebKit::WebNotificationPresenter* notificationPresenter();
+#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
+    WebKit::WebGeolocationClient* geolocationClient();
+#else
   virtual WebKit::WebGeolocationService* geolocationService();
+#endif
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
   virtual WebKit::WebSpeechInputController* speechInputController(
       WebKit::WebSpeechInputListener*);
@@ -323,7 +327,9 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
     edit_command_value_.clear();
   }
 
+#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   void SetGeolocationPermission(bool allowed);
+#endif
 
   void ClearContextMenuData();
 
@@ -379,8 +385,10 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   // Get a string suitable for dumping a frame to the console.
   std::wstring GetFrameDescription(WebKit::WebFrame* webframe);
 
+#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   // Returns a TestGeolocationService owned by this delegate.
   TestGeolocationService* GetTestGeolocationService();
+#endif
 
   // Causes navigation actions just printout the intended navigation instead
   // of taking you to the page. This is used for cases like mailto, where you
@@ -459,7 +467,9 @@ class TestWebViewDelegate : public WebKit::WebViewClient,
   // The mock spellchecker used in TestWebViewDelegate::spellCheck().
   MockSpellCheck mock_spellcheck_;
 
+#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   scoped_ptr<TestGeolocationService> test_geolocation_service_;
+#endif
 
   DISALLOW_COPY_AND_ASSIGN(TestWebViewDelegate);
 };