Remove legacy non-client-based geolocation code.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2011 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
 #include "webkit/tools/test_shell/accessibility_controller.h"
 #include "webkit/tools/test_shell/notification_presenter.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h"
-#endif
-
 using WebKit::WebCanvas;
 using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebRect;
 using WebKit::WebScriptController;
 using WebKit::WebSize;
 using WebKit::WebURLRequest;
 using WebKit::WebView;
 
 namespace {
@@ skipping 569 matching lines @@
 void TestShell::SizeToDefault() {
   SizeTo(kTestWindowWidth, kTestWindowHeight);
 }
 
 void TestShell::ResetTestController() {
   accessibility_controller_->Reset();
   layout_test_controller_->Reset();
   event_sending_controller_->Reset();
   notification_presenter_->Reset();
   delegate_->Reset();
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
   if (geolocation_client_mock_.get())
     geolocation_client_mock_->resetMock();
-#endif
 }
 
 void TestShell::LoadFile(const FilePath& file) {
   LoadURLForFrame(net::FilePathToFileURL(file), std::wstring());
 }
 
 void TestShell::LoadURL(const GURL& url) {
   // Used as a sentinal for run_webkit_tests.py to know when to start reading
   // test output for this test and so we know we're not getting out of sync.
   if (layout_test_mode_ && dump_when_finished_ && test_params())
@@ skipping 119 matching lines @@
   speech_input_controller_mock_.reset(
       WebKit::WebSpeechInputControllerMock::create(listener));
   return speech_input_controller_mock_.get();
 }
 
 WebKit::WebSpeechInputControllerMock*
 TestShell::speech_input_controller_mock() {
   return speech_input_controller_mock_.get();
 }
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }
-#endif
 
 //-----------------------------------------------------------------------------
 
 namespace webkit_glue {
 
 void PrecacheUrl(const char16* url, int url_length) {}
 
 void AppendToLog(const char* file, int line, const char* msg) {
   logging::LogMessage(file, line).stream() << msg;
 }
@@ skipping 97 matching lines @@
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path);
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue