aura: Fix views_unittests and aura_unittests on linux.

. Use NativeScrollBarViews in aura and wayland.
. Disable clipboard-related tests in TextfieldViewsModelTest until aura on linux
  has clipboard support.
. Use osmesa implementation for aura_unittests.

TBR=evan@chromium.org
BUG=97845, 99128
TEST=views_unittests passes on linux with use_aura

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

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

7 files changed, 46 insertions, 58 deletions

diff --git a/base/message_pump_x.cc b/base/message_pump_x.cc
index 45f24a6..4feab2d 100644
--- a/base/message_pump_x.cc
+++ b/base/message_pump_x.cc
@@ -167,7 +167,7 @@ bool MessagePumpX::HasXInput2() {
 void MessagePumpX::InitXSource() {
   DCHECK(!x_source_);
   GPollFD* x_poll = new GPollFD();
-  x_poll->fd = ConnectionNumber(g_xdisplay);
+  x_poll->fd = ConnectionNumber(GetDefaultXDisplay());
   x_poll->events = G_IO_IN;
 
   x_source_ = g_source_new(&XSourceFuncs, sizeof(GSource));
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 5a42a40..f6496636 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -83,6 +83,7 @@
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
         'aura',
       ],
       'include_dirs': [
diff --git a/ui/aura/test_suite.cc b/ui/aura/test_suite.cc
index 8d8c68c..ff1cc02 100644
--- a/ui/aura/test_suite.cc
+++ b/ui/aura/test_suite.cc
@@ -10,11 +10,15 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/gfx_paths.h"
+#include "ui/gfx/gl/gl_implementation.h"
 
 AuraTestSuite::AuraTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
 void AuraTestSuite::Initialize() {
+#if defined(OS_LINUX)
+  gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
+#endif
   base::TestSuite::Initialize();
 
   gfx::RegisterPathProvider();
diff --git a/views/controls/scrollbar/native_scroll_bar.cc b/views/controls/scrollbar/native_scroll_bar.cc
index 5372b17..44fbafb 100644
--- a/views/controls/scrollbar/native_scroll_bar.cc
+++ b/views/controls/scrollbar/native_scroll_bar.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -11,6 +11,10 @@
 #include "views/controls/scrollbar/native_scroll_bar_wrapper.h"
 #include "views/widget/widget.h"
 
+#if defined(USE_AURA)
+#include "views/controls/scrollbar/native_scroll_bar_views.h"
+#endif
+
 namespace views {
 
 // static
@@ -97,29 +101,5 @@ int NativeScrollBar::GetPosition() const {
   return native_wrapper_->GetPosition();
 }
 
-
-#if defined(USE_AURA)
-
-// static
-NativeScrollBarWrapper* NativeScrollBarWrapper::CreateWrapper(
-    NativeScrollBar* scroll_bar) {
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
-// static
-int NativeScrollBarWrapper::GetHorizontalScrollBarHeight() {
-  NOTIMPLEMENTED();
-  return 16;
-}
-
-// static
-int NativeScrollBarWrapper::GetVerticalScrollBarWidth() {
-  NOTIMPLEMENTED();
-  return 16;
-}
-
-#endif
-
 }  // namespace views
 
diff --git a/views/controls/scrollbar/native_scroll_bar_views.cc b/views/controls/scrollbar/native_scroll_bar_views.cc
index f007b50..aaa86c1 100644
--- a/views/controls/scrollbar/native_scroll_bar_views.cc
+++ b/views/controls/scrollbar/native_scroll_bar_views.cc
@@ -384,4 +384,25 @@ gfx::Rect NativeScrollBarViews::GetTrackBounds() const {
   return bounds;
 }
 
+#if !defined(TOOLKIT_USES_GTK)
+////////////////////////////////////////////////////////////////////////////////
+// NativewScrollBarWrapper, public:
+
+// static
+NativeScrollBarWrapper* NativeScrollBarWrapper::CreateWrapper(
+    NativeScrollBar* scroll_bar) {
+  return new NativeScrollBarViews(scroll_bar);
+}
+
+// static
+int NativeScrollBarWrapper::GetHorizontalScrollBarHeight() {
+  return 20;
+}
+
+// static
+int NativeScrollBarWrapper::GetVerticalScrollBarWidth() {
+  return 20;
+}
+#endif
+
 }  // namespace views
diff --git a/views/controls/scrollbar/native_scroll_bar_wayland.cc b/views/controls/scrollbar/native_scroll_bar_wayland.cc
deleted file mode 100644
index 706647f..0000000
--- a/views/controls/scrollbar/native_scroll_bar_wayland.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.
-
-#include "views/controls/scrollbar/native_scroll_bar.h"
-#include "views/controls/scrollbar/native_scroll_bar_views.h"
-#include "views/controls/scrollbar/native_scroll_bar_wrapper.h"
-
-namespace views {
-
-////////////////////////////////////////////////////////////////////////////////
-// NativewScrollBarWrapper, public:
-
-// static
-NativeScrollBarWrapper* NativeScrollBarWrapper::CreateWrapper(
-    NativeScrollBar* scroll_bar) {
-  return new NativeScrollBarViews(scroll_bar);
-}
-
-// static
-int NativeScrollBarWrapper::GetHorizontalScrollBarHeight() {
-  return 20;
-}
-
-// static
-int NativeScrollBarWrapper::GetVerticalScrollBarWidth() {
-  return 20;
-}
-
-}  // namespace views
diff --git a/views/controls/textfield/textfield_views_model_unittest.cc b/views/controls/textfield/textfield_views_model_unittest.cc
index 3eba578..36f8fe6 100644
--- a/views/controls/textfield/textfield_views_model_unittest.cc
+++ b/views/controls/textfield/textfield_views_model_unittest.cc
@@ -502,7 +502,12 @@ TEST_F(TextfieldViewsModelTest, SetText) {
   EXPECT_EQ(0U, model.GetCursorPosition());
 }
 
-TEST_F(TextfieldViewsModelTest, Clipboard) {
+#if defined(USE_AURA) && defined(OS_LINUX)
+#define MAYBE_Clipboard DISABLED_Clipboard  // http://crbug.com/97845
+#else
+#define MAYBE_Clipboard Clipboard
+#endif
+TEST_F(TextfieldViewsModelTest, MAYBE_Clipboard) {
   ui::Clipboard* clipboard
       = views::ViewsDelegate::views_delegate->GetClipboard();
   string16 initial_clipboard_text;
@@ -1055,7 +1060,14 @@ TEST_F(TextfieldViewsModelTest, UndoRedo_SetText) {
   EXPECT_FALSE(model.Redo());
 }
 
-TEST_F(TextfieldViewsModelTest, UndoRedo_CutCopyPasteTest) {
+#if defined(USE_AURA) && defined(OS_LINUX)
+// This can be re-enabled when aura on linux has clipboard support.
+// http://crbug.com/97845
+#define MAYBE_UndoRedo_CutCopyPasteTest DISABLED_UndoRedo_CutCopyPasteTest
+#else
+#define MAYBE_UndoRedo_CutCopyPasteTest UndoRedo_CutCopyPasteTest
+#endif
+TEST_F(TextfieldViewsModelTest, MAYBE_UndoRedo_CutCopyPasteTest) {
   TextfieldViewsModel model(NULL);
   model.SetText(ASCIIToUTF16("ABCDE"));
   EXPECT_FALSE(model.Redo());  // nothing to redo