Misc. cleanup for chrome/

Found while working on AshTestHelper.

Bug: none
Change-Id: Ief613d20336460807cd53f1a36df21a6d4800d91
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2125299
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754502}

chrome/browser/chromeos/crostini/crostini_test_util.cc

@@ -16,7 +16,7 @@ std::unique_ptr<views::ScopedViewsTestHelper> views_helper_;
 // DialogDelegate::CreateDialogWidget().
 class TestViewsDelegateWithContext : public ChromeTestViewsDelegate<> {
  public:
-  TestViewsDelegateWithContext() {}
+  TestViewsDelegateWithContext() = default;
 
   void set_context(gfx::NativeWindow context) { context_ = context; }
 
@@ -40,8 +40,7 @@ class TestViewsDelegateWithContext : public ChromeTestViewsDelegate<> {
 namespace crostini {
 
 void SetUpViewsEnvironmentForTesting() {
-  std::unique_ptr<TestViewsDelegateWithContext> views_delegate(
-      new TestViewsDelegateWithContext);
+  auto views_delegate = std::make_unique<TestViewsDelegateWithContext>();
   TestViewsDelegateWithContext* views_delegate_weak = views_delegate.get();
   views_helper_ =
       std::make_unique<views::ScopedViewsTestHelper>(std::move(views_delegate));

chrome/browser/extensions/api/processes/processes_api.cc

@@ -154,25 +154,22 @@ void FillProcessData(
 
   const double cpu_usage = task_manager->GetPlatformIndependentCPUUsage(id);
   if (!std::isnan(cpu_usage))
-    out_process->cpu.reset(new double(cpu_usage));
+    out_process->cpu = std::make_unique<double>(cpu_usage);
 
   const int64_t network_usage = task_manager->GetProcessTotalNetworkUsage(id);
   if (network_usage != -1)
-    out_process->network.reset(new double(static_cast<double>(network_usage)));
+    out_process->network = std::make_unique<double>(network_usage);
 
   int64_t v8_allocated = 0;
   int64_t v8_used = 0;
   if (task_manager->GetV8Memory(id, &v8_allocated, &v8_used)) {
-    out_process->js_memory_allocated.reset(new double(static_cast<double>(
-        v8_allocated)));
-    out_process->js_memory_used.reset(new double(static_cast<double>(v8_used)));
+    out_process->js_memory_allocated = std::make_unique<double>(v8_allocated);
+    out_process->js_memory_used = std::make_unique<double>(v8_used);
   }
 
   const int64_t sqlite_bytes = task_manager->GetSqliteMemoryUsed(id);
-  if (sqlite_bytes != -1) {
-    out_process->sqlite_memory.reset(new double(static_cast<double>(
-        sqlite_bytes)));
-  }
+  if (sqlite_bytes != -1)
+    out_process->sqlite_memory = std::make_unique<double>(sqlite_bytes);
 
   blink::WebCacheResourceTypeStats cache_stats;
   if (task_manager->GetWebCacheStats(id, &cache_stats)) {

chrome/browser/memory/memory_kills_monitor.cc

@@ -70,10 +70,7 @@ MemoryKillsMonitor::Handle::~Handle() {
   }
 }
 
-MemoryKillsMonitor::MemoryKillsMonitor()
-    : low_memory_kills_count_(0),
-      last_oom_kill_time_(-1),
-      oom_kills_count_(0) {}
+MemoryKillsMonitor::MemoryKillsMonitor() = default;
 
 MemoryKillsMonitor::~MemoryKillsMonitor() {
   // The instance has to be leaked on shutdown as it is referred to by a

chrome/browser/memory/memory_kills_monitor.h

@@ -104,14 +104,14 @@ class MemoryKillsMonitor : public base::DelegateSimpleThread::Delegate,
   base::Time last_low_memory_kill_time_;
   // The number of low memory kills since monitoring is started. Accessed from
   // UI thread only.
-  int low_memory_kills_count_;
+  int low_memory_kills_count_ = 0;
 
   // The last time an OOM kill happens. Accessed from
   // |non_joinable_worker_thread_| only.
-  int64_t last_oom_kill_time_;
+  int64_t last_oom_kill_time_ = -1;
   // The number of OOM kills since monitoring is started. Accessed from
   // |non_joinable_worker_thread_| only.
-  int oom_kills_count_;
+  int oom_kills_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(MemoryKillsMonitor);
 };

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -850,7 +850,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
   views::Widget* CreateArcWindow(const std::string& window_app_id) {
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     params.bounds = gfx::Rect(5, 5, 20, 20);
-    params.context = ash_test_helper()->GetContext();
+    params.context = GetContext();
     views::Widget* widget = new views::Widget();
     widget->Init(std::move(params));
     // Set ARC id before showing the window to be recognized in

chrome/test/base/browser_with_test_window_test.cc

@@ -28,11 +28,9 @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
-#include "chrome/test/views/chrome_test_views_delegate.h"
 #include "components/constrained_window/constrained_window_views.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/test/ash_test_views_delegate.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "content/public/browser/context_factory.h"
 #endif
@@ -48,16 +46,11 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {}
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 #if defined(OS_CHROMEOS)
-  test_views_delegate_ =
-      std::make_unique<ChromeTestViewsDelegate<ash::AshTestViewsDelegate>>();
   ash_test_helper_.SetUp();
-#elif defined(TOOLKIT_VIEWS)
-  views_test_helper_.reset(new views::ScopedViewsTestHelper(
-      std::make_unique<ChromeTestViewsDelegate<>>()));
 #endif
 
-  // This must be created after ash_test_helper_ is set up so that it doesn't
-  // create an DeviceDataManager.
+  // This must be created after |ash_test_helper_| is set up so that it doesn't
+  // create a DeviceDataManager.
   rvh_test_enabler_ = std::make_unique<content::RenderViewHostTestEnabler>();
 
 #if defined(TOOLKIT_VIEWS)

chrome/test/base/browser_with_test_window_test.h

@@ -19,6 +19,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(TOOLKIT_VIEWS)
+#include "chrome/test/views/chrome_test_views_delegate.h"
+
 #if defined(OS_CHROMEOS)
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/ash_test_views_delegate.h"
@@ -36,12 +38,6 @@
 
 class GURL;
 
-#if defined(TOOLKIT_VIEWS)
-namespace views {
-class TestViewsDelegate;
-}  // namespace views
-#endif
-
 namespace content {
 class NavigationController;
 }
@@ -226,9 +222,12 @@ class BrowserWithTestWindowTest : public testing::Test {
 
 #if defined(OS_CHROMEOS)
   ash::AshTestHelper ash_test_helper_;
-  std::unique_ptr<views::TestViewsDelegate> test_views_delegate_;
+  std::unique_ptr<views::TestViewsDelegate> test_views_delegate_ =
+      std::make_unique<ChromeTestViewsDelegate<ash::AshTestViewsDelegate>>();
 #elif defined(TOOLKIT_VIEWS)
-  std::unique_ptr<views::ScopedViewsTestHelper> views_test_helper_;
+  std::unique_ptr<views::ScopedViewsTestHelper> views_test_helper_ =
+      std::make_unique<views::ScopedViewsTestHelper>(
+          std::make_unique<ChromeTestViewsDelegate<>>());
 #endif
 
   // The existence of this object enables tests via RenderViewHostTester.