MacViews: Change Widget context type to NativeWindow

chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
@@ skipping 80 matching lines @@
 
   void set_name(const base::string16& name) { name_ = name; }
 
  private:
   base::string16 name_;
   ui::AXRole role_;
   DISALLOW_COPY_AND_ASSIGN(ViewWithNameAndRole);
 };
 
 class AccessibilityEventRouterViewsTest
     : public testing::Test {

[tapted, 2014/07/14 00:33:14]

not for this CL, but this should be inheriting from ViewsTestBase, so it has
access to GetContext() and can do away with all the #ifdefs :/

[Andre, 2014/07/14 17:49:09]

Acknowledged.

  public:
   AccessibilityEventRouterViewsTest() : control_event_count_(0) {
   }
 
   virtual void SetUp() {
 #if defined(OS_WIN)
     ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
@@ skipping 21 matching lines @@
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
     base::MessageLoop::current()->RunUntilIdle();
 
 #if defined(OS_WIN)
     ole_initializer_.reset();
 #endif
   }
 
   views::Widget* CreateWindowWithContents(views::View* contents) {
-    gfx::NativeView context = NULL;
+    gfx::NativeWindow context = NULL;
 #if defined(USE_AURA)
     context = aura_test_helper_->root_window();
 #endif
     views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds(
         new AccessibilityWindowDelegate(contents),
         context,
         gfx::Rect(0, 0, 500, 500));
 
     // Create a profile and associate it with this window.
     widget->SetNativeWindowProperty(Profile::kProfileKey, &profile_);
@@ skipping 348 matching lines @@
 
     AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
         menu_container,
         menu->GetMenuItemByID(kTestCases[i].command_id),
         &index,
         &count);
     EXPECT_EQ(kTestCases[i].expected_index, index) << "Case " << i;
     EXPECT_EQ(kTestCases[i].expected_count, count) << "Case " << i;
   }
 }