Remove stl_util's deletion function use from chrome/.

chrome/browser/diagnostics/diagnostics_model.cc

 // Copyright (c) 2011 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/diagnostics/diagnostics_model.h"
 
 #include <algorithm>
+#include <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/path_service.h"
-#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/diagnostics/diagnostics_test.h"
 #include "chrome/browser/diagnostics/recon_diagnostics.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 
 namespace diagnostics {
 
@@ skipping 18 matching lines @@
 // code becomes:
 // 1- Inserting the appropriate tests into |tests_|
 // 2- Overriding RunTest() to wrap it with the appropriate fatal exception
 //    handler for the OS.
 // This class owns the all the tests and will only delete them upon
 // destruction.
 class DiagnosticsModelImpl : public DiagnosticsModel {
  public:
   DiagnosticsModelImpl() : tests_run_(0) {}
 
-  ~DiagnosticsModelImpl() override { base::STLDeleteElements(&tests_); }
+  ~DiagnosticsModelImpl() override {}
 
   int GetTestRunCount() const override { return tests_run_; }
 
   int GetTestAvailableCount() const override { return tests_.size(); }
 
   void RunAll(DiagnosticsModel::Observer* observer) override {
     size_t test_count = tests_.size();
     bool continue_running = true;
     for (size_t i = 0; i != test_count; ++i) {
       // If one of the diagnostic steps returns false, we want to
       // mark the rest of them as "skipped" in the UMA stats.
       if (continue_running) {
-        continue_running = RunTest(tests_[i], observer, i);
+        continue_running = RunTest(tests_[i].get(), observer, i);
         ++tests_run_;
       } else {
 #if defined(OS_CHROMEOS)  // Only collecting UMA stats on ChromeOS
         RecordUMATestResult(static_cast<DiagnosticsTestId>(tests_[i]->GetId()),
                             RESULT_SKIPPED);
 #else
         // On other platforms, we can just bail out if a diagnostic step returns
         // false.
         break;
 #endif
       }
     }
     if (observer)
       observer->OnAllTestsDone(this);
   }
 
   void RecoverAll(DiagnosticsModel::Observer* observer) override {
     size_t test_count = tests_.size();
     bool continue_running = true;
     for (size_t i = 0; i != test_count; ++i) {
       // If one of the recovery steps returns false, we want to
       // mark the rest of them as "skipped" in the UMA stats.
       if (continue_running) {
-        continue_running = RunRecovery(tests_[i], observer, i);
+        continue_running = RunRecovery(tests_[i].get(), observer, i);
       } else {
 #if defined(OS_CHROMEOS)  // Only collecting UMA stats on ChromeOS
         RecordUMARecoveryResult(
             static_cast<DiagnosticsTestId>(tests_[i]->GetId()), RESULT_SKIPPED);
 #else
         // On other platforms, we can just bail out if a recovery step returns
         // false.
         break;
 #endif
       }
     }
     if (observer)
       observer->OnAllRecoveryDone(this);
   }
 
   const TestInfo& GetTest(size_t index) const override {
     return *tests_[index];
   }
 
   bool GetTestInfo(int id, const TestInfo** result) const override {
     DCHECK(id < DIAGNOSTICS_TEST_ID_COUNT);
     DCHECK(id >= 0);
-    for (size_t i = 0; i < tests_.size(); i++) {
-      if (tests_[i]->GetId() == id) {
-        *result = tests_[i];
+    for (const auto& test : tests_) {
+      if (test->GetId() == id) {
+        *result = test.get();
         return true;
       }
     }
     return false;
   }
 
  protected:
   // Run a particular diagnostic test. Return false if no other tests should be
   // run.
   virtual bool RunTest(DiagnosticsTest* test,
                        Observer* observer,
                        size_t index) {
     return test->Execute(observer, this, index);
   }
 
   // Recover from a particular diagnostic test. Return false if no further
   // recovery should be run.
   virtual bool RunRecovery(DiagnosticsTest* test,
                            Observer* observer,
                            size_t index) {
     return test->Recover(observer, this, index);
   }
 
-  typedef std::vector<DiagnosticsTest*> TestArray;
-  TestArray tests_;
+  std::vector<std::unique_ptr<DiagnosticsTest>> tests_;
   int tests_run_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelImpl);
 };
 
 // Each platform can have their own tests. For the time being there is only
 // one test that works on all platforms.
 #if defined(OS_WIN)
 class DiagnosticsModelWin : public DiagnosticsModelImpl {
@@ skipping 88 matching lines @@
 #if defined(OS_WIN)
   return new DiagnosticsModelWin();
 #elif defined(OS_MACOSX)
   return new DiagnosticsModelMac();
 #elif defined(OS_POSIX)
   return new DiagnosticsModelPosix();
 #endif
 }
 
 }  // namespace diagnostics