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

chrome/browser/ui/views/menu_model_adapter_test.cc

 // Copyright (c) 2012 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 "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/ui_controls/ui_controls.h"
@@ skipping 70 matching lines @@
   }
 
   virtual void ReleaseRef() OVERRIDE {
   }
 
   // Converts views::Event::flags to a WindowOpenDisposition.
   virtual int GetDispositionForEvent(int event_flags) OVERRIDE {
     return 0;
   }
 
+#if defined(USE_AURA)
+  virtual views::NativeWidgetHelperAura* CreateNativeWidgetHelper(
+      views::NativeWidgetAura* native_widget) OVERRIDE {
+    return NULL;
+  }
+#endif
+
  private:
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
 
 // Implement most of the ui::MenuModel pure virtual methods for subclasses
 //
 // Exceptions:
 //  virtual int GetItemCount() const = 0;
 //  virtual ItemType GetTypeAt(int index) const = 0;
 //  virtual int GetCommandIdAt(int index) const = 0;
@@ skipping 269 matching lines @@
   TestViewsDelegate views_delegate_;
 
   views::MenuButton* button_;
   TopMenuModel top_menu_model_;
   views::MenuModelAdapter menu_model_adapter_;
   views::MenuItemView* menu_;
   scoped_ptr<views::MenuRunner> menu_runner_;
 };
 
 VIEW_TEST(MenuModelAdapterTest, RebuildMenu)