Upstream for a thing

chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc

 // Copyright (c) 2015 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 10 matching lines @@
 #include "components/toolbar/test_toolbar_model.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
+#include "ui/views/test/views_test_base.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
 #endif
 
 using gfx::Range;
 
 namespace {
 
@@ skipping 125 matching lines @@
 
   ToolbarModel* toolbar_model_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingOmniboxEditController);
 };
 
 }  // namespace
 
 // OmniboxViewViewsTest -------------------------------------------------------
 
-class OmniboxViewViewsTest : public testing::Test {
+class OmniboxViewViewsTest : public views::ViewsTestBase {
  public:
   OmniboxViewViewsTest();
 
   TestingOmniboxView* omnibox_view() { return omnibox_view_.get(); }
   views::Textfield* omnibox_textfield() { return omnibox_view(); }
   ui::TextEditCommand scheduled_text_edit_command() const {
     return test_api_->scheduled_text_edit_command();
   }
 
   // Sets |new_text| as the omnibox text, and emphasizes it appropriately.  If
@@ skipping 34 matching lines @@
   if (accept_input) {
     // We don't need to actually navigate in this case (and doing so in a test
     // would be difficult); it's sufficient to mark input as "no longer in
     // progress", and the edit model will assume the current text is a URL.
     omnibox_view()->model()->SetInputInProgress(false);
   }
   omnibox_view()->EmphasizeURLComponents();
 }
 
 void OmniboxViewViewsTest::SetUp() {
+  ViewsTestBase::SetUp();
 #if defined(OS_CHROMEOS)
   chromeos::input_method::InitializeForTesting(
       new chromeos::input_method::MockInputMethodManagerImpl);
 #endif
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
   omnibox_view_ = base::MakeUnique<TestingOmniboxView>(
       &omnibox_edit_controller_,
       base::MakeUnique<ChromeOmniboxClient>(&omnibox_edit_controller_,
                                             &profile_),
       &command_updater_);
   test_api_ = base::MakeUnique<views::TextfieldTestApi>(omnibox_view_.get());
   omnibox_view_->Init();
 }
 
 void OmniboxViewViewsTest::TearDown() {
   omnibox_view_.reset();
 #if defined(OS_CHROMEOS)
   chromeos::input_method::Shutdown();
 #endif
+  ViewsTestBase::TearDown();
 }
 
 // Actual tests ---------------------------------------------------------------
 
 // Checks that a single change of the text in the omnibox invokes
 // only one call to OmniboxViewViews::UpdatePopup().
 TEST_F(OmniboxViewViewsTest, UpdatePopupCall) {
   ui::KeyEvent char_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::US_A, 0,
                           ui::DomKey::FromCharacter('a'),
                           ui::EventTimeForNow());
@@ skipping 112 matching lines @@
       EXPECT_EQ(TestingOmniboxView::to_base_text_emphasis(
                     test_case.expected_base_text_emphasized),
                 omnibox_view()->base_text_emphasis());
       EXPECT_EQ(test_case.expected_emphasis_range,
                 omnibox_view()->emphasis_range());
       EXPECT_EQ(test_case.expected_scheme_range,
                 omnibox_view()->scheme_range());
     }
   }
 }