Re-land:

views/controls/combobox/native_combobox_views_unittest.cc

 // 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 "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/controls/combobox/native_combobox_views.h"
 #include "views/ime/mock_input_method.h"
@@ skipping 83 matching lines @@
     ViewsTestBase::TearDown();
   }
 
   void InitCombobox() {
     model_.reset(new TestComboboxModel());
 
     ASSERT_FALSE(combobox_);
     combobox_ = new TestCombobox(model_.get());
     combobox_->SetID(1);
 
-    widget_ = Widget::CreateWidget();
+    widget_ = new Widget;
     Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(combobox_);
 
     combobox_view_
         = static_cast<NativeComboboxViews*>(combobox_->native_wrapper());
     ASSERT_TRUE(combobox_view_);
@@ skipping 43 matching lines @@
   SendKeyEvent(ui::VKEY_DOWN);
   EXPECT_EQ(combobox_->selected_item(), 2);
   SendKeyEvent(ui::VKEY_RIGHT);
   EXPECT_EQ(combobox_->selected_item(), 2);
   SendKeyEvent(ui::VKEY_LEFT);
   EXPECT_EQ(combobox_->selected_item(), 2);
 }
 
 }  // namespace views