Deactivate omnibox touch editing on command execution

ui/views/touchui/touch_selection_controller_impl_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 "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/controls/textfield/textfield_test_api.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/views_touch_selection_controller_factory.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 using base::WideToUTF16;
 
 namespace {
@@ skipping 61 matching lines @@
     textfield_widget_->Init(params);
     View* container = new View();
     textfield_widget_->SetContentsView(container);
     container->AddChildView(textfield_);
 
     textfield_->SetBoundsRect(gfx::Rect(0, 0, 200, 20));
     textfield_->set_id(1);
     textfield_widget_->Show();
 
     textfield_->RequestFocus();
+
+    textfield_test_api_.reset(new TextfieldTestApi(textfield_));
   }
 
   void CreateWidget() {
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     widget_->Init(params);
     widget_->Show();
   }
 
  protected:
   static bool IsCursorHandleVisibleFor(
       ui::TouchSelectionController* controller) {
     TouchSelectionControllerImpl* impl =
         static_cast<TouchSelectionControllerImpl*>(controller);
     return impl->IsCursorHandleVisible();
   }
 
   gfx::Rect GetCursorRect(const gfx::SelectionModel& sel) {
-    return textfield_->GetRenderText()->GetCursorBounds(sel, true);
+    return textfield_test_api_->GetRenderText()->GetCursorBounds(sel, true);
   }
 
   gfx::Point GetCursorPosition(const gfx::SelectionModel& sel) {
     gfx::Rect cursor_bounds = GetCursorRect(sel);
     return gfx::Point(cursor_bounds.x(), cursor_bounds.y());
   }
 
   TouchSelectionControllerImpl* GetSelectionController() {
     return static_cast<TouchSelectionControllerImpl*>(
-        textfield_->touch_selection_controller_.get());
+        textfield_test_api_->touch_selection_controller());
   }
 
   void StartTouchEditing() {
-    textfield_->CreateTouchSelectionControllerAndNotifyIt();
+    textfield_test_api_->CreateTouchSelectionControllerAndNotifyIt();
   }
 
   void EndTouchEditing() {
-    textfield_->touch_selection_controller_.reset();
+    textfield_test_api_->ResetTouchSelectionController();
   }
 
   void SimulateSelectionHandleDrag(gfx::Point p, int selection_handle) {
     TouchSelectionControllerImpl* controller = GetSelectionController();
     // Do the work of OnMousePressed().
     if (selection_handle == 1)
       controller->SetDraggingHandle(controller->selection_handle_1_.get());
     else
       controller->SetDraggingHandle(controller->selection_handle_2_.get());
 
@@ skipping 28 matching lines @@
 
   bool IsSelectionHandle2Visible() {
     return GetSelectionController()->IsSelectionHandle2Visible();
   }
 
   bool IsCursorHandleVisible() {
     return GetSelectionController()->IsCursorHandleVisible();
   }
 
   gfx::RenderText* GetRenderText() {
-    return textfield_->GetRenderText();
+    return textfield_test_api_->GetRenderText();
   }
 
   gfx::Point GetCursorHandleDragPoint() {
     gfx::Point point = GetCursorHandlePosition();
     const gfx::SelectionModel& sel = textfield_->GetSelectionModel();
     int cursor_height = GetCursorRect(sel).height();
     point.Offset(GetHandleImageSize().width() / 2 + kPadding,
                  GetHandleImageSize().height() / 2 + cursor_height);
     return point;
   }
 
   Widget* textfield_widget_;
   Widget* widget_;
 
   Textfield* textfield_;
+  scoped_ptr<TextfieldTestApi> textfield_test_api_;
   scoped_ptr<ViewsTouchSelectionControllerFactory> views_tsc_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TouchSelectionControllerImplTest);
 };
 
 // If textfield has selection, this macro verifies that the selection handles
 // are visible and at the correct positions (at the end points of selection).
 // |cursor_at_selection_handle_1| is used to decide whether selection
 // handle 1's position is matched against the start of selection or the end.
@@ skipping 623 matching lines @@
   // Start touch editing; then press a key and ensure it deactivates touch
   // selection.
   StartTouchEditing();
   EXPECT_TRUE(GetSelectionController());
   generator.PressKey(ui::VKEY_A, 0);
   RunPendingMessages();
   EXPECT_FALSE(GetSelectionController());
 }
 
 }  // namespace views