Implement support in DefaultComponentInstaller for picking up bundled

chrome/browser/component_updater/sw_reporter_installer_win.cc

 // Copyright (c) 2014 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/sw_reporter_installer_win.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
@@ skipping 114 matching lines @@
   void ComponentReady(
       const base::Version& version,
       const base::FilePath& install_dir,
       std::unique_ptr<base::DictionaryValue> manifest) override {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     safe_browsing::RunSwReporter(install_dir.Append(kSwReporterExeName),
                                  version, base::ThreadTaskRunnerHandle::Get(),
                                  base::WorkerPool::GetTaskRunner(true));
   }
 
-  base::FilePath GetBaseDirectory() const override { return install_dir(); }
+  base::FilePath GetRelativeInstallDir() const override {
+    return base::FilePath(FILE_PATH_LITERAL("SwReporter"));
+  }
 
   void GetHash(std::vector<uint8_t>* hash) const override { GetPkHash(hash); }
 
   std::string GetName() const override { return "Software Reporter Tool"; }
 
   std::string GetAp() const override { return std::string(); }
 
-  static base::FilePath install_dir() {
-    // The base directory on windows looks like:
-    // <profile>\AppData\Local\Google\Chrome\User Data\SwReporter\.
-    base::FilePath result;
-    PathService::Get(DIR_SW_REPORTER, &result);
-    return result;
-  }
-
   static std::string ID() {
     update_client::CrxComponent component;
     component.version = Version("0.0.0.0");
     GetPkHash(&component.pk_hash);
     return update_client::GetCrxComponentID(component);
   }
 
  private:
   static void GetPkHash(std::vector<uint8_t>* hash) {
     DCHECK(hash);
@@ skipping 95 matching lines @@
 }
 
 void RegisterProfilePrefsForSwReporter(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kSwReporterPromptVersion, "");
 
   registry->RegisterStringPref(prefs::kSwReporterPromptSeed, "");
 }
 
 }  // namespace component_updater