Componentize component_updater: Use Configurator to build query parameters.

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 <string>
 #include <vector>
 
 #include "base/base_paths.h"
@@ skipping 10 matching lines @@
 #include "base/prefs/pref_service.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "base/win/registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"
 #include "chrome/browser/component_updater/default_component_installer.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/pref_names.h"
+#include "components/component_updater/component_updater_paths.h"
+#include "components/component_updater/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace component_updater {
 
 namespace {
 
 // These values are used to send UMA information and are replicated in the
 // histograms.xml file, so the order MUST NOT CHANGE.
@@ skipping 112 matching lines @@
   virtual base::FilePath GetBaseDirectory() const { return install_dir(); }
 
   virtual void GetHash(std::vector<uint8>* hash) const { GetPkHash(hash); }
 
   virtual std::string GetName() const { return "Software Reporter Tool"; }
 
   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(chrome::DIR_USER_DATA, &result);
-    return result.Append(FILE_PATH_LITERAL("SwReporter"));
+    PathService::Get(DIR_SW_REPORTER, &result);
+    return result;
   }
 
   static std::string ID() {
     CrxComponent component;
     component.version = Version("0.0.0.0");
     GetPkHash(&component.pk_hash);
     return component_updater::GetCrxComponentID(component);
   }
 
   static base::FilePath VersionPath() { return base::FilePath(version_dir_); }
@@ skipping 95 matching lines @@
     else
       ReportUmaStep(SW_REPORTER_RETRIED_TOO_MANY_TIMES);
   }
 }
 
 void RegisterPrefsForSwReporter(PrefRegistrySimple* registry) {
   registry->RegisterIntegerPref(prefs::kSwReporterExecuteTryCount, 0);
 }
 
 }  // namespace component_updater