Index: chrome/browser/component_updater/component_updater_configurator.cc |
diff --git a/chrome/browser/component_updater/component_updater_configurator.cc b/chrome/browser/component_updater/component_updater_configurator.cc |
index 269dea124262d606dabbe60bf425244d2f11aff0..c2fbfe94621cabaa5cec1a19b10f61fe2894e799 100644 |
--- a/chrome/browser/component_updater/component_updater_configurator.cc |
+++ b/chrome/browser/component_updater/component_updater_configurator.cc |
@@ -10,11 +10,9 @@ |
#include "base/command_line.h" |
#include "base/compiler_specific.h" |
-#include "base/strings/string_util.h" |
#include "base/win/windows_version.h" |
#include "build/build_config.h" |
#include "chrome/browser/component_updater/component_patcher.h" |
-#include "chrome/common/chrome_switches.h" |
#include "net/url_request/url_request_context_getter.h" |
namespace component_updater { |
@@ -89,7 +87,7 @@ std::string GetSwitchArgument(const std::vector<std::string>& vec, |
class ChromeConfigurator : public ComponentUpdateService::Configurator { |
public: |
- ChromeConfigurator(const CommandLine* cmdline, |
+ ChromeConfigurator(const std::vector<std::string>& switch_values, |
net::URLRequestContextGetter* url_request_getter); |
virtual ~ChromeConfigurator() {} |
@@ -120,18 +118,13 @@ class ChromeConfigurator : public ComponentUpdateService::Configurator { |
}; |
ChromeConfigurator::ChromeConfigurator( |
- const CommandLine* cmdline, |
+ const std::vector<std::string>& switch_values, |
net::URLRequestContextGetter* url_request_getter) |
: url_request_getter_(url_request_getter), |
fast_update_(false), |
pings_enabled_(false), |
deltas_enabled_(false), |
background_downloads_enabled_(false) { |
- // Parse comma-delimited debug flags. |
- std::vector<std::string> switch_values; |
- Tokenize(cmdline->GetSwitchValueASCII(switches::kComponentUpdater), |
- ",", |
- &switch_values); |
fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate); |
pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings); |
deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates); |
@@ -209,9 +202,9 @@ bool ChromeConfigurator::UseBackgroundDownloader() const { |
} |
ComponentUpdateService::Configurator* MakeChromeComponentUpdaterConfigurator( |
- const CommandLine* cmdline, |
+ const std::vector<std::string>& switch_values, |
net::URLRequestContextGetter* context_getter) { |
- return new ChromeConfigurator(cmdline, context_getter); |
+ return new ChromeConfigurator(switch_values, context_getter); |
} |
} // namespace component_updater |