Certificate Transparency: Wire the TreeStateTracker up.

chrome/browser/component_updater/sth_set_component_installer.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 <utility>
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
+#include "chrome/browser/net/sth_distributor_provider.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/sha2.h"
 #include "net/cert/ct_log_response_parser.h"
 #include "net/cert/signed_tree_head.h"
 #include "net/cert/sth_distributor.h"
 #include "net/cert/sth_observer.h"
 
 using component_updater::ComponentUpdateService;
@@ skipping 14 matching lines @@
 // The SHA256 of the SubjectPublicKeyInfo used to sign the extension.
 // The extension id is: ojjgnpkioondelmggbekfhllhdaimnho
 const uint8_t kPublicKeySHA256[32] = {
     0xe9, 0x96, 0xdf, 0xa8, 0xee, 0xd3, 0x4b, 0xc6, 0x61, 0x4a, 0x57,
     0xbb, 0x73, 0x08, 0xcd, 0x7e, 0x51, 0x9b, 0xcc, 0x69, 0x08, 0x41,
     0xe1, 0x96, 0x9f, 0x7c, 0xb1, 0x73, 0xef, 0x16, 0x80, 0x0a};
 
 const char kSTHSetFetcherManifestName[] = "Signed Tree Heads";
 
 STHSetComponentInstallerTraits::STHSetComponentInstallerTraits(
-    std::unique_ptr<net::ct::STHObserver> sth_observer)
-    : sth_observer_(std::move(sth_observer)) {}
+    net::ct::STHObserver* sth_observer)
+    : sth_observer_(sth_observer) {}
 
 STHSetComponentInstallerTraits::~STHSetComponentInstallerTraits() {}
 
 bool STHSetComponentInstallerTraits::CanAutoUpdate() const {
   return true;
 }
 
 // Public data is delivered via this component, no need for encryption.
 bool STHSetComponentInstallerTraits::RequiresNetworkEncryption() const {
   return false;
@@ skipping 97 matching lines @@
   if (!net::ct::FillSignedTreeHead(*(parsed_json.get()), &signed_tree_head)) {
     LOG(ERROR) << "Failed to fill in signed tree head.";
     return;
   }
 
   // The log id is not a part of the response, fill in manually.
   signed_tree_head.log_id = log_id;
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&net::ct::STHObserver::NewSTHObserved,
-                 base::Unretained(sth_observer_.get()), signed_tree_head));
+                 base::Unretained(sth_observer_), signed_tree_head));
 }
 
 void STHSetComponentInstallerTraits::OnJsonParseError(
     const std::string& log_id,
     const std::string& error) {
   DVLOG(1) << "STH loading failed: " << error
            << " for log: " << base::HexEncode(log_id.data(), log_id.length());
 }
 
 void RegisterSTHSetComponent(ComponentUpdateService* cus,
                              const base::FilePath& user_data_dir) {
   DVLOG(1) << "Registering STH Set fetcher component.";
 
-  // TODO(eranm): The next step in auditing CT logs (crbug.com/506227) is to
-  // pass the distributor to the IOThread so it can be used in a per-profile
-  // context for checking inclusion of SCTs.
-  std::unique_ptr<net::ct::STHDistributor> distributor(
-      new net::ct::STHDistributor());
+  net::ct::STHDistributor* distributor(
+      chrome_browser_net::GetGlobalSTHDistributor());
+  // The global STHDistributor should have been created by this point.
+  DCHECK(distributor != nullptr);

[Ryan Sleevi, 2016/05/27 04:59:53]

DCHECK(distributor)

(Rely on boolean conversion)

[Eran Messeri, 2016/05/27 08:43:54]

Done.

 
   std::unique_ptr<ComponentInstallerTraits> traits(
-      new STHSetComponentInstallerTraits(std::move(distributor)));
+      new STHSetComponentInstallerTraits(distributor));
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 }
 
 }  // namespace component_updater