Remove ScopedVector from chrome/test/chromedriver/

chrome/test/chromedriver/logging.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 "chrome/test/chromedriver/logging.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/test/chromedriver/capabilities.h"
 #include "chrome/test/chromedriver/chrome/console_logger.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/command_listener_proxy.h"
 #include "chrome/test/chromedriver/performance_logger.h"
 #include "chrome/test/chromedriver/session.h"
 
@@ skipping 236 matching lines @@
                        false,   // enable_thread_id
                        false,   // enable_timestamp
                        false);  // enable_tickcount
   logging::SetLogMessageHandler(&HandleLogMessage);
 
   logging::LoggingSettings logging_settings;
   logging_settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   return logging::InitLogging(logging_settings);
 }
 
-Status CreateLogs(const Capabilities& capabilities,
-                  const Session* session,
-                  ScopedVector<WebDriverLog>* out_logs,
-                  ScopedVector<DevToolsEventListener>* out_devtools_listeners,
-                  ScopedVector<CommandListener>* out_command_listeners) {
-  ScopedVector<WebDriverLog> logs;
-  ScopedVector<DevToolsEventListener> devtools_listeners;
-  ScopedVector<CommandListener> command_listeners;
+Status CreateLogs(
+    const Capabilities& capabilities,
+    const Session* session,
+    std::vector<std::unique_ptr<WebDriverLog>>* out_logs,
+    std::vector<std::unique_ptr<DevToolsEventListener>>* out_devtools_listeners,
+    std::vector<std::unique_ptr<CommandListener>>* out_command_listeners) {
+  std::vector<std::unique_ptr<WebDriverLog>> logs;
+  std::vector<std::unique_ptr<DevToolsEventListener>> devtools_listeners;
+  std::vector<std::unique_ptr<CommandListener>> command_listeners;
   Log::Level browser_log_level = Log::kWarning;
   const LoggingPrefs& prefs = capabilities.logging_prefs;
 
   for (LoggingPrefs::const_iterator iter = prefs.begin();
        iter != prefs.end();
        ++iter) {
     std::string type = iter->first;
     Log::Level level = iter->second;
     if (type == WebDriverLog::kPerformanceType) {
       if (level != Log::kOff) {
-        WebDriverLog* log = new WebDriverLog(type, Log::kAll);
-        logs.push_back(log);
+        logs.push_back(base::MakeUnique<WebDriverLog>(type, Log::kAll));
+        devtools_listeners.push_back(base::MakeUnique<PerformanceLogger>(
+            logs.back().get(), session, capabilities.perf_logging_prefs));
         PerformanceLogger* perf_log =
-            new PerformanceLogger(log, session,
-                                  capabilities.perf_logging_prefs);
+            static_cast<PerformanceLogger*>(devtools_listeners.back().get());
         // We use a proxy for |perf_log|'s |CommandListener| interface.
         // Otherwise, |perf_log| would be owned by both session->chrome and
         // |session|, which would lead to memory errors on destruction.
         // session->chrome will own |perf_log|, and |session| will own |proxy|.
         // session->command_listeners (the proxy) will be destroyed first.
-        CommandListenerProxy* proxy = new CommandListenerProxy(perf_log);
-        devtools_listeners.push_back(perf_log);
-        command_listeners.push_back(proxy);
+        command_listeners.push_back(
+            base::MakeUnique<CommandListenerProxy>(perf_log));
       }
     } else if (type == WebDriverLog::kBrowserType) {
       browser_log_level = level;
     } else if (type != WebDriverLog::kDriverType) {
       // Driver "should" ignore unrecognized log types, per Selenium tests.
       // For example the Java client passes the "client" log type in the caps,
       // which the server should never provide.
       LOG(WARNING) << "Ignoring unrecognized log type: " << type;
     }
   }
   // Create "browser" log -- should always exist.
-  WebDriverLog* browser_log =
-      new WebDriverLog(WebDriverLog::kBrowserType, browser_log_level);
-  logs.push_back(browser_log);
+  logs.push_back(base::MakeUnique<WebDriverLog>(WebDriverLog::kBrowserType,
+                                                browser_log_level));
   // If the level is OFF, don't even bother listening for DevTools events.
   if (browser_log_level != Log::kOff)
-    devtools_listeners.push_back(new ConsoleLogger(browser_log));
+    devtools_listeners.push_back(
+        base::MakeUnique<ConsoleLogger>(logs.back().get()));
 
   out_logs->swap(logs);
   out_devtools_listeners->swap(devtools_listeners);
   out_command_listeners->swap(command_listeners);
   return Status(kOk);
 }