Implement support in DefaultComponentInstaller for picking up bundled

chrome/browser/component_updater/caps_installer_win.cc

 // Copyright 2015 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/caps_installer_win.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 33 matching lines @@
 
 // CRX hash. The extension id is: bcpgokokgekmnfkohklccmonnakdimfh.
 const uint8_t kSha256Hash[] = {0x12, 0xf6, 0xea, 0xea, 0x64, 0xac, 0xd5, 0xae,
                                0x7a, 0xb2, 0x2c, 0xed, 0xd0, 0xa3, 0x8c, 0x57,
                                0x49, 0x05, 0x8f, 0x7d, 0x14, 0xa4, 0x22, 0x4d,
                                0x9b, 0xf6, 0x14, 0x99, 0xdf, 0xf8, 0xc9, 0xb3};
 
 const base::FilePath::CharType kCapsBinary[] =
     FILE_PATH_LITERAL("chrome_crash_svc.exe");
 
-const base::FilePath::CharType kCapsDirectory[] =
-    FILE_PATH_LITERAL("Caps");
-
 // This function is called from a worker thread to launch crash service.
 void LaunchService(const base::FilePath& exe_path) {
   base::CommandLine service_cmdline(exe_path);
   service_cmdline.AppendSwitch("caps-update");
   base::Process service =
       base::LaunchProcess(service_cmdline, base::LaunchOptions());
   CAPSUmaValue uma_step = service.IsValid() ?
       CAPS_SERVICE_STARTED : CAPS_SERVICE_FAILED_TO_START;
   ReportUmaStep(uma_step);
 }
@@ skipping 24 matching lines @@
       const base::FilePath& install_dir,
       std::unique_ptr<base::DictionaryValue> manifest) override {
     // Can't block here. This is usually the browser UI thread.
     base::WorkerPool::PostTask(
         FROM_HERE,
         base::Bind(&LaunchService, install_dir.Append(kCapsBinary)),
         false);
   }
 
   // Directory is usually "%appdata%\Local\Chrome\User Data\Caps".
-  base::FilePath GetBaseDirectory() const override {
-    base::FilePath user_data;
-    PathService::Get(chrome::DIR_USER_DATA, &user_data);
-    return user_data.Append(kCapsDirectory);
+  base::FilePath GetRelativeInstallDir() const override {
+    return base::FilePath(FILE_PATH_LITERAL("Caps"));
   }
 
   void GetHash(std::vector<uint8_t>* hash) const override {
     hash->assign(kSha256Hash,
                  kSha256Hash + arraysize(kSha256Hash));
   }
 
   // This string is shown in chrome://components.
   std::string GetName() const override { return "Chrome Crash Service"; }
 
   std::string GetAp() const override { return std::string(); }
 };
 
 }  // namespace
 
 void RegisterCAPSComponent(ComponentUpdateService* cus) {
   // The component updater takes ownership of |installer|.
   std::unique_ptr<ComponentInstallerTraits> traits(new CAPSInstallerTraits());
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 }
 
 }  // namespace component_updater