Revert rev 69137 due to incorrect change log.

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 49 matching lines @@
 class TestShellDevToolsAgent;
 class TestShellDevToolsClient;
 class TestWebViewDelegate;
 
 namespace base {
 class StringPiece;
 }
 
 namespace WebKit {
 class WebDeviceOrientationClientMock;
-class WebGeolocationClientMock;
 class WebSpeechInputControllerMock;
 class WebSpeechInputListener;
 }
 
 class TestShell : public base::SupportsWeakPtr<TestShell>  {
 public:
     struct TestParams {
       // Load the test defaults.
       TestParams() : dump_tree(true), dump_pixels(false) {
       }
@@ skipping 285 matching lines @@
     TestShellDevToolsAgent* dev_tools_agent() {
       return dev_tools_agent_.get();
     }
 
     WebKit::WebDeviceOrientationClientMock* device_orientation_client_mock();
 
     WebKit::WebSpeechInputControllerMock* CreateSpeechInputControllerMock(
         WebKit::WebSpeechInputListener* listener);
     WebKit::WebSpeechInputControllerMock* speech_input_controller_mock();
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-    WebKit::WebGeolocationClientMock* geolocation_client_mock();
-#endif
-
 protected:
     void CreateDevToolsClient(TestShellDevToolsAgent* agent);
     bool Initialize(const GURL& starting_url);
     bool IsSVGTestURL(const GURL& url);
     void SizeToSVG();
     void SizeToDefault();
     void SizeTo(int width, int height);
     void ResizeSubViews();
 
     // Set the focus in interactive mode (pass through to relevant system call).
@@ skipping 64 matching lines @@
     scoped_ptr<TestWebViewDelegate> popup_delegate_;
 
     base::WeakPtr<TestShell> devtools_shell_;
     scoped_ptr<TestShellDevToolsAgent> dev_tools_agent_;
     scoped_ptr<TestShellDevToolsClient> dev_tools_client_;
     scoped_ptr<WebKit::WebDeviceOrientationClientMock>
         device_orientation_client_mock_;
     scoped_ptr<WebKit::WebSpeechInputControllerMock>
         speech_input_controller_mock_;
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-    scoped_ptr<WebKit::WebGeolocationClientMock> geolocation_client_mock_;
-#endif
     const TestParams* test_params_;
 
     // True while a test is preparing to run
     static bool test_is_preparing_;
 
     // True while a test is running
     static bool test_is_pending_;
 
     // Number of times to load each URL.
     static int load_count_;
@@ skipping 28 matching lines @@
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_