Aura/ash split: Remove hacks and get chrome linking without ash.

ui/views/test/test_views_delegate.cc

Index: ui/views/test/test_views_delegate.cc
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index 6fa6bb7e8fa5897bca46bb461d3f2902ae9aca03..10ef745f0afa9ff9ced38348dac3ce53a69efab8 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -7,6 +7,10 @@
 #include "base/logging.h"
 #include "ui/base/clipboard/clipboard.h"
 
+#if defined(USE_AURA) && !defined(USE_ASH)
+#include "ui/views/widget/desktop_native_widget_helper_aura.h"
+#endif
+
 namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
@@ -57,4 +61,15 @@ int TestViewsDelegate::GetDispositionForEvent(int event_flags) {
   return 0;
 }
 
+#if defined(USE_AURA)
+views::NativeWidgetHelperAura* TestViewsDelegate::CreateNativeWidgetHelper(
+    views::NativeWidgetAura* native_widget) {
+#if !defined(USE_ASH)

[Ben Goodger (Google), 2012/04/17 23:42:45]

you can't have ash here either

+  return new views::DesktopNativeWidgetHelperAura(native_widget);
+#else
+  return NULL;
+#endif
+}
+#endif
+
 }  // namespace views