Index: chrome/browser/component_updater/chrome_component_updater_configurator.cc |
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc |
index 36f602d5d7b09d3a09f404dcf6d88fa34bb9d8f1..f4dbf0f767e3135dbb52d6a82c3eaa436f573cf7 100644 |
--- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc |
+++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc |
@@ -30,12 +30,6 @@ using update_client::OutOfProcessPatcher; |
namespace component_updater { |
-namespace { |
- |
-// Default time constants. |
-const int kDelayOneMinute = 60; |
-const int kDelayOneHour = kDelayOneMinute * 60; |
- |
// Debug values you can pass to --component-updater=value1,value2. |
// Speed up component checking. |
const char kSwitchFastUpdate[] = "fast-update"; |
@@ -45,11 +39,25 @@ const char kSwitchRequestParam[] = "test-request"; |
// Disables pings. Pings are the requests sent to the update server that report |
// the success or the failure of component install or update attempts. |
-extern const char kSwitchDisablePings[] = "disable-pings"; |
+const char kSwitchDisablePings[] = "disable-pings"; |
// Sets the URL for updates. |
const char kSwitchUrlSource[] = "url-source"; |
+// 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) |
+ |
+namespace { |
+ |
+// Default time constants. |
+const int kDelayOneMinute = 60; |
+const int kDelayOneHour = kDelayOneMinute * 60; |
+ |
#define COMPONENT_UPDATER_SERVICE_ENDPOINT \ |
"//clients2.google.com/service/update2" |
@@ -61,14 +69,6 @@ const char kSwitchUrlSource[] = "url-source"; |
const char kDefaultUrlSource[] = "https:" COMPONENT_UPDATER_SERVICE_ENDPOINT; |
const char kAltUrlSource[] = "http:" COMPONENT_UPDATER_SERVICE_ENDPOINT; |
-// 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) |
- |
// Returns true if and only if |test| is contained in |vec|. |
bool HasSwitchValue(const std::vector<std::string>& vec, const char* test) { |
if (vec.empty()) |