summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/test_shell.h
diff options
context:
space:
mode:
authorjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-31 14:06:25 +0000
committerjknotten@chromium.org <jknotten@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-31 14:06:25 +0000
commit7e0c4706a960664c1a262f582344ff6b1de64208 (patch)
tree183972136eb8683c092530d14c90efc496097935 /webkit/tools/test_shell/test_shell.h
parentc660f70215b0810954fc012d374575349d0a8808 (diff)
downloadchromium_src-7e0c4706a960664c1a262f582344ff6b1de64208.zip
chromium_src-7e0c4706a960664c1a262f582344ff6b1de64208.tar.gz
chromium_src-7e0c4706a960664c1a262f582344ff6b1de64208.tar.bz2
Make class declarations ABI compatible, irrespective of ENABLE_CLIENT_BASED_GEOLOCATION define.
BUG=59907 TEST=None Review URL: http://codereview.chromium.org/6031010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell.h')
-rw-r--r--webkit/tools/test_shell/test_shell.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 29d3d1f..731e2bd 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -373,9 +373,7 @@ public:
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);
@@ -460,10 +458,8 @@ private:
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