Kill PlatformScreenMac.mm

Replace it with an implementation of GetScreenInfoHelper like
the other platforms.  This webkit glue function is implemented
in webkit_glue_mac.mm.

Now that we have a GetScreenInfoHelper implemented for each
platform, I moved the implementation of GetScreenInfo into
test_shell.cc.

R=dglazkov

Review URL: http://codereview.chromium.org/16470

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

4 files changed, 4 insertions, 15 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 47d29d5..cb2d437 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -576,6 +576,10 @@ bool SpellCheckWord(const wchar_t* word, int word_len,
   return true;
 }
 
+ScreenInfo GetScreenInfo(gfx::NativeView window) {
+  return GetScreenInfoHelper(window);
+}
+
 bool IsPluginRunningInRendererProcess() {
   return true;
 }
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index d61f5a9..7d63e87 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -718,8 +718,4 @@ bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   return false;
 }
 
-ScreenInfo GetScreenInfo(gfx::NativeView window) {
-  return GetScreenInfoHelper(window);
-}
-
 }  // namespace webkit_glue
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index bf6ca2a..a96d587 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -690,13 +690,6 @@ bool GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   return false; // NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
 }
 
-ScreenInfo GetScreenInfo(gfx::NativeView window) {
-  // This should call GetScreenInfoHelper, which should be implemented in
-  // webkit_glue_mac.mm
-  NOTIMPLEMENTED();
-  return ScreenInfo();
-}
-
 bool DownloadUrl(const std::string& url, NSWindow* caller_window) {
   return false;
 }
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index b8c1870..c904102 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -768,8 +768,4 @@ bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
-ScreenInfo GetScreenInfo(gfx::NativeView window) {
-  return GetScreenInfoHelper(window);
-}
-
 }  // namespace webkit_glue