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 87046bf1bfbf3a65ef1157c2723233371ef38445..65b1f8599aafa2cb412af9024078816a61d3f83e 100644 |
--- a/chrome/browser/component_updater/component_updater_configurator.cc |
+++ b/chrome/browser/component_updater/component_updater_configurator.cc |
@@ -17,10 +17,6 @@ |
#include "chrome/common/chrome_switches.h" |
#include "net/url_request/url_request_context_getter.h" |
-#if defined(OS_WIN) |
-#include "chrome/browser/component_updater/component_patcher_win.h" |
-#endif |
- |
namespace component_updater { |
namespace { |
@@ -53,9 +49,10 @@ const char kDefaultUrlSource[] = "https:" COMPONENT_UPDATER_SERVICE_ENDPOINT; |
// The url to send the pings to. |
const char kPingUrl[] = "http:" COMPONENT_UPDATER_SERVICE_ENDPOINT; |
-#if defined(OS_WIN) |
// Disables differential updates. |
const char kSwitchDisableDeltaUpdates[] = "disable-delta-updates"; |
+ |
+#if defined(OS_WIN) |
// Disables background downloads. |
const char kSwitchDisableBackgroundDownloads[] = "disable-background-downloads"; |
#endif // defined(OS_WIN) |
@@ -109,7 +106,6 @@ class ChromeConfigurator : public ComponentUpdateService::Configurator { |
virtual size_t UrlSizeLimit() OVERRIDE; |
virtual net::URLRequestContextGetter* RequestContext() OVERRIDE; |
virtual bool InProcess() OVERRIDE; |
- virtual ComponentPatcher* CreateComponentPatcher() OVERRIDE; |
virtual bool DeltasEnabled() const OVERRIDE; |
virtual bool UseBackgroundDownloader() const OVERRIDE; |
@@ -136,12 +132,12 @@ ChromeConfigurator::ChromeConfigurator(const CommandLine* cmdline, |
",", &switch_values); |
fast_update_ = HasSwitchValue(switch_values, kSwitchFastUpdate); |
pings_enabled_ = !HasSwitchValue(switch_values, kSwitchDisablePings); |
-#if defined(OS_WIN) |
deltas_enabled_ = !HasSwitchValue(switch_values, kSwitchDisableDeltaUpdates); |
+ |
+#if defined(OS_WIN) |
background_downloads_enabled_ = |
!HasSwitchValue(switch_values, kSwitchDisableBackgroundDownloads); |
#else |
- deltas_enabled_ = false; |
background_downloads_enabled_ = false; |
#endif |
@@ -202,14 +198,6 @@ bool ChromeConfigurator::InProcess() { |
return false; |
} |
-ComponentPatcher* ChromeConfigurator::CreateComponentPatcher() { |
-#if defined(OS_WIN) |
- return new ComponentPatcherWin(); |
-#else |
- return new ComponentPatcherCrossPlatform(); |
-#endif |
-} |
- |
bool ChromeConfigurator::DeltasEnabled() const { |
return deltas_enabled_; |
} |