Misc. cleanup

Found while working on AshTestHelper.

Bug: none
Change-Id: Ia942c7662dea4b3194a31930efe9ce244286effe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2125396Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754697}

chromecast/graphics/gestures/multiple_tap_detector_test.cc

@@ -101,7 +101,6 @@ class MultipleTapDetectorTest : public aura::test::AuraTestBase {
 // Verify that a simple correct triple tap triggers the delegate.
 TEST_F(MultipleTapDetectorTest, TripleTap) {
   EXPECT_CALL(delegate(), OnTripleTap(Eq(kTestTapLocation))).Times(1);
-  ;
   EXPECT_CALL(delegate(), OnDoubleTap(Eq(kTestTapLocation))).Times(0);
 
   detector().set_enabled(true);

chromeos/services/network_config/public/cpp/cros_network_config_test_helper.cc

@@ -12,14 +12,8 @@
 namespace chromeos {
 namespace network_config {
 
-CrosNetworkConfigTestHelper::CrosNetworkConfigTestHelper() {
-  network_state_helper_ = std::make_unique<NetworkStateTestHelper>(
-      false /* use_default_devices_and_services */);
-  network_device_handler_ =
-      chromeos::NetworkDeviceHandler::InitializeForTesting(
-          network_state_helper_->network_state_handler());
-  Initialize(/*network_configuration_handler=*/nullptr);
-}
+CrosNetworkConfigTestHelper::CrosNetworkConfigTestHelper()
+    : CrosNetworkConfigTestHelper(true) {}
 
 CrosNetworkConfigTestHelper::CrosNetworkConfigTestHelper(bool initialize) {
   network_state_helper_ = std::make_unique<NetworkStateTestHelper>(

components/constrained_window/constrained_window_views_unittest.cc

@@ -28,8 +28,8 @@ namespace {
 
 class DialogContents : public views::DialogDelegateView {
  public:
-  DialogContents() {}
-  ~DialogContents() override {}
+  DialogContents() = default;
+  ~DialogContents() override = default;
 
   void set_modal_type(ui::ModalType modal_type) { modal_type_ = modal_type; }
 
@@ -50,7 +50,7 @@ class DialogContents : public views::DialogDelegateView {
 class TestConstrainedWindowViewsClient
     : public constrained_window::ConstrainedWindowViewsClient {
  public:
-  TestConstrainedWindowViewsClient() {}
+  TestConstrainedWindowViewsClient() = default;
 
   // ConstrainedWindowViewsClient:
   web_modal::ModalDialogHost* GetModalDialogHost(
@@ -70,7 +70,7 @@ class TestConstrainedWindowViewsClient
 // pass a null |context| argument to DialogDelegate::CreateDialogWidget().
 class TestViewsDelegateWithContext : public views::TestViewsDelegate {
  public:
-  TestViewsDelegateWithContext() {}
+  TestViewsDelegateWithContext() = default;
 
   void set_context(gfx::NativeWindow context) { context_ = context; }
 
@@ -91,12 +91,11 @@ class TestViewsDelegateWithContext : public views::TestViewsDelegate {
 
 class ConstrainedWindowViewsTest : public views::ViewsTestBase {
  public:
-  ConstrainedWindowViewsTest() : contents_(nullptr), dialog_(nullptr) {}
-  ~ConstrainedWindowViewsTest() override {}
+  ConstrainedWindowViewsTest() = default;
+  ~ConstrainedWindowViewsTest() override = default;
 
   void SetUp() override {
-    std::unique_ptr<TestViewsDelegateWithContext> views_delegate(
-        new TestViewsDelegateWithContext);
+    auto views_delegate = std::make_unique<TestViewsDelegateWithContext>();
 
     // set_views_delegate() must be called before SetUp(), and GetContext() is
     // null before that, so take a reference.
@@ -137,9 +136,9 @@ class ConstrainedWindowViewsTest : public views::ViewsTestBase {
   Widget* dialog() { return dialog_; }
 
  private:
-  DialogContents* contents_;
+  DialogContents* contents_ = nullptr;
   std::unique_ptr<web_modal::TestWebContentsModalDialogHost> dialog_host_;
-  Widget* dialog_;
+  Widget* dialog_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViewsTest);
 };

components/exo/test/exo_test_base.cc

@@ -5,7 +5,6 @@
 #include "components/exo/test/exo_test_base.h"
 
 #include "ash/shell.h"
-#include "components/exo/test/exo_test_helper.h"
 #include "components/exo/wm_helper.h"
 #include "components/exo/wm_helper_chromeos.h"
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
@@ -21,11 +20,9 @@ namespace test {
 ////////////////////////////////////////////////////////////////////////////////
 // ExoTestBase, public:
 
-ExoTestBase::ExoTestBase()
-    : exo_test_helper_(new ExoTestHelper),
-      scale_mode_(ui::ScopedAnimationDurationScaleMode::ZERO_DURATION) {}
+ExoTestBase::ExoTestBase() = default;
 
-ExoTestBase::~ExoTestBase() {}
+ExoTestBase::~ExoTestBase() = default;
 
 void ExoTestBase::SetUp() {
   AshTestBase::SetUp();

components/exo/test/exo_test_base.h

@@ -9,7 +9,7 @@
 
 #include "ash/test/ash_test_base.h"
 #include "base/macros.h"
-#include "ui/compositor/scoped_animation_duration_scale_mode.h"
+#include "components/exo/test/exo_test_helper.h"
 
 namespace viz {
 class SurfaceManager;
@@ -26,18 +26,17 @@ class ExoTestBase : public ash::AshTestBase {
   ExoTestBase();
   ~ExoTestBase() override;
 
-  // Overridden from testing::Test:
+  // ash::AshTestBase:
   void SetUp() override;
   void TearDown() override;
 
   viz::SurfaceManager* GetSurfaceManager();
 
-  ExoTestHelper* exo_test_helper() { return exo_test_helper_.get(); }
+  ExoTestHelper* exo_test_helper() { return &exo_test_helper_; }
 
  private:
-  std::unique_ptr<ExoTestHelper> exo_test_helper_;
+  ExoTestHelper exo_test_helper_;
   std::unique_ptr<WMHelper> wm_helper_;
-  ui::ScopedAnimationDurationScaleMode scale_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(ExoTestBase);
 };

components/exo/wayland/clients/test/wayland_client_test_helper.cc

@@ -11,7 +11,6 @@
 #include "ash/session/session_controller_impl.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_helper.h"
-#include "ash/test/ash_test_views_delegate.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -492,18 +492,18 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
   void SetUpEnvironment() {
     ImageTransportFactory::SetFactory(
         std::make_unique<TestImageTransportFactory>());
-    aura_test_helper_.reset(new aura::test::AuraTestHelper(
-        ImageTransportFactory::GetInstance()->GetContextFactory()));
+    aura_test_helper_ = std::make_unique<aura::test::AuraTestHelper>(
+        ImageTransportFactory::GetInstance()->GetContextFactory());
     aura_test_helper_->SetUp();
 
-    browser_context_.reset(new TestBrowserContext);
+    browser_context_ = std::make_unique<TestBrowserContext>();
     process_host_ = new MockRenderProcessHost(browser_context_.get());
     process_host_->Init();
 
     sink_ = &process_host_->sink();
 
     int32_t routing_id = process_host_->GetNextRoutingID();
-    delegates_.push_back(base::WrapUnique(new MockRenderWidgetHostDelegate));
+    delegates_.push_back(std::make_unique<MockRenderWidgetHostDelegate>());
     parent_host_ = MockRenderWidgetHostImpl::Create(delegates_.back().get(),
                                                     process_host_, routing_id);
     delegates_.back()->set_widget_host(parent_host_);
@@ -4833,10 +4833,9 @@ TEST_F(RenderWidgetHostViewAuraTest, VirtualKeyboardFocusEnsureCaretInRect) {
   // TODO (oshima): Test that overscroll occurs.
 
   view_->InitAsChild(nullptr);
-  aura::client::ParentWindowWithContext(
-      view_->GetNativeView(), parent_view_->GetNativeView()->GetRootWindow(),
-      gfx::Rect());
   aura::Window* root_window = parent_view_->GetNativeView()->GetRootWindow();
+  aura::client::ParentWindowWithContext(view_->GetNativeView(), root_window,
+                                        gfx::Rect());
 
   const gfx::Rect orig_view_bounds = gfx::Rect(0, 300, 400, 200);
   const gfx::Rect shifted_view_bounds = gfx::Rect(0, 200, 400, 200);

content/public/test/test_renderer_host.cc

@@ -205,10 +205,10 @@ std::unique_ptr<WebContents>
 RenderViewHostTestHarness::CreateTestWebContents() {
 // Make sure we ran SetUp() already.
 #if defined(OS_WIN)
-  DCHECK(ole_initializer_ != NULL);
+  DCHECK(ole_initializer_);
 #endif
 #if defined(USE_AURA)
-  DCHECK(aura_test_helper_ != nullptr);
+  DCHECK(aura_test_helper_);
 #endif
 
   scoped_refptr<SiteInstance> instance =
@@ -232,22 +232,20 @@ void RenderViewHostTestHarness::NavigateAndCommit(
 }
 
 void RenderViewHostTestHarness::SetUp() {
-  rvh_test_enabler_.reset(new RenderViewHostTestEnabler);
+  rvh_test_enabler_ = std::make_unique<RenderViewHostTestEnabler>();
   if (factory_)
     rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory_);
 
 #if defined(OS_WIN)
-  ole_initializer_.reset(new ui::ScopedOleInitializer());
+  ole_initializer_ = std::make_unique<ui::ScopedOleInitializer>();
 #endif
 #if defined(USE_AURA)
-  ui::ContextFactory* context_factory =
-      ImageTransportFactory::GetInstance()->GetContextFactory();
-
-  aura_test_helper_.reset(new aura::test::AuraTestHelper(context_factory));
+  aura_test_helper_ = std::make_unique<aura::test::AuraTestHelper>(
+      ImageTransportFactory::GetInstance()->GetContextFactory());
   aura_test_helper_->SetUp();
 #endif
 
-  sanity_checker_.reset(new ContentBrowserSanityChecker());
+  sanity_checker_ = std::make_unique<ContentBrowserSanityChecker>();
 
 #if !defined(OS_ANDROID)
   network_change_notifier_ = net::test::MockNetworkChangeNotifier::Create();

content/shell/browser/shell_platform_data_aura.cc

@@ -108,13 +108,14 @@ ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) {
   host_->window()->Show();
   host_->window()->SetLayoutManager(new FillLayout(host_->window()));
 
-  focus_client_.reset(new aura::test::TestFocusClient(host_->window()));
+  focus_client_ =
+      std::make_unique<aura::test::TestFocusClient>(host_->window());
 
   new wm::DefaultActivationClient(host_->window());
-  capture_client_.reset(
-      new aura::client::DefaultCaptureClient(host_->window()));
-  window_parenting_client_.reset(
-      new aura::test::TestWindowParentingClient(host_->window()));
+  capture_client_ =
+      std::make_unique<aura::client::DefaultCaptureClient>(host_->window());
+  window_parenting_client_ =
+      std::make_unique<aura::test::TestWindowParentingClient>(host_->window());
 }
 
 ShellPlatformDataAura::~ShellPlatformDataAura() {