Fix InputMethod Widget activation checks; cleanup, etc.

ui/views/controls/textfield/native_textfield_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 <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 154 matching lines @@
   }
 
   void InitTextfields(Textfield::StyleFlags style, int count) {
     // Append kEnableViewsTextfield to use NativeTextfieldViews on Windows.
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitch(switches::kEnableViewsTextfield);
 
     ASSERT_FALSE(textfield_);
     textfield_ = new TestTextfield(style);
     textfield_->SetController(this);
-    widget_ = new Widget;
+    widget_ = new Widget();
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(textfield_);
 
     textfield_view_ = static_cast<NativeTextfieldViews*>(
         textfield_->GetNativeWrapperForTesting());
     textfield_view_->SetBoundsRect(params.bounds);
     textfield_->set_id(1);
 
     for (int i = 1; i < count; i++) {
       Textfield* textfield = new Textfield(style);
       container->AddChildView(textfield);
       textfield->set_id(i + 1);
     }
 
     DCHECK(textfield_view_);
     model_ = textfield_view_->model_.get();
     model_->ClearEditHistory();
 
     input_method_ = new MockInputMethod();
     widget_->ReplaceInputMethod(input_method_);
 
-    // Assumes the Widget is always focused.
-    input_method_->OnFocus();
-
-    // TODO(msw): Determine why this requires two calls to work on Windows.
-    textfield_->RequestFocus();
+    // Activate the widget and focus the textfield for input handling.
+    widget_->Activate();
     textfield_->RequestFocus();
   }
 
   ui::MenuModel* GetContextMenuModel() {
     textfield_view_->UpdateContextMenu();
     return textfield_view_->context_menu_contents_.get();
   }
 
   ui::TouchSelectionController* GetTouchSelectionController() {
     return textfield_view_->touch_selection_controller_.get();
@@ skipping 1556 matching lines @@
   textfield_view_->OnGestureEvent(&tap_down);
   // Create a new long press event since the previous one is not marked handled.
   GestureEventForTest long_press2(ui::ET_GESTURE_LONG_PRESS, eventX, eventY, 0);
   textfield_view_->OnGestureEvent(&long_press2);
   EXPECT_STR_EQ("hello", textfield_->GetSelectedText());
   EXPECT_FALSE(GetTouchSelectionController());
 }
 #endif
 
 }  // namespace views