Certificate Transparency: Wire the TreeStateTracker up.

chrome/browser/component_updater/sth_set_component_installer_unittest.cc

 // Copyright 2016 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/component_updater/sth_set_component_installer.h"
 
 #include <map>
 #include <memory>
 #include <string>
 
@@ skipping 26 matching lines @@
 };
 
 class STHSetComponentInstallerTest : public PlatformTest {
  public:
   STHSetComponentInstallerTest() {}
   void SetUp() override {
     PlatformTest::SetUp();
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
-    std::unique_ptr<StoringSTHObserver> observer(new StoringSTHObserver());
-    observer_ = observer.get();
-    traits_.reset(new STHSetComponentInstallerTraits(std::move(observer)));
+    observer_.reset(new StoringSTHObserver());
+    traits_.reset(new STHSetComponentInstallerTraits(observer_.get()));
   }
 
   void WriteSTHToFile(const std::string& sth_json,
                       const base::FilePath& filename) {
     ASSERT_EQ(static_cast<int32_t>(sth_json.length()),
               base::WriteFile(filename, sth_json.data(), sth_json.length()));
   }
 
   base::FilePath GetSTHsDir() {
     return temp_dir_.path()
@@ skipping 15 matching lines @@
     const base::Version v("1.0");
     traits_->LoadSTHsFromDisk(sths_dir, v);
     // Drain the RunLoop created by the TestBrowserThreadBundle
     base::RunLoop().RunUntilIdle();
   }
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
 
   base::ScopedTempDir temp_dir_;
+  std::unique_ptr<StoringSTHObserver> observer_;
+  // traits_ should be destroyed  before the observer_ as it holds a pointer
+  // to it.
   std::unique_ptr<STHSetComponentInstallerTraits> traits_;
-  StoringSTHObserver* observer_;
   safe_json::TestingJsonParser::ScopedFactoryOverride factory_override_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(STHSetComponentInstallerTest);
 };
 
 // Parses valid STH JSON in a file with valid hex encoding of log id.
 TEST_F(STHSetComponentInstallerTest, CanLoadAllSTHs) {
   const base::DictionaryValue manifest;
   const base::FilePath sths_dir(GetSTHsDir());
@@ skipping 44 matching lines @@
 
   const base::FilePath not_hex_sth_file =
       sths_dir.Append(FILE_PATH_LITERAL("nothex.sth"));
   WriteSTHToFile(net::ct::GetSampleSTHAsJson(), not_hex_sth_file);
 
   LoadSTHs(manifest, sths_dir);
   EXPECT_EQ(0u, observer_->sths.size());
 }
 
 }  // namespace component_updater