Component updater: send extra attributes in the request to

chrome/browser/component_updater/component_updater_configurator.cc

Index: chrome/browser/component_updater/component_updater_configurator.cc
===================================================================
--- chrome/browser/component_updater/component_updater_configurator.cc	(revision 103747)
+++ chrome/browser/component_updater/component_updater_configurator.cc	(working copy)
@@ -12,6 +12,7 @@
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
+#include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ -30,6 +31,43 @@
   return (std::find(vec.begin(), vec.end(), test) != vec.end());
 }
 
+// The request extra information is the OS and architecture, this helps
+// the server select the right package to be delivered.
+const char kExtraInfo[] =
+#if defined(OS_MACOSX)
+  #if defined(__amd64__)
+    "os=mac&arch=x64";
+  #elif defined(__i386__)
+     "os=mac&arch=x86";
+  #else
+     "os=mac&arch=other";
+  #endif
+#elif defined(OS_WIN)
+  #if defined(_WIN64)
+    "os=win&arch=x64";
+  #elif defined(_WIN32)
+    "os=win&arch=x86";
+  #else
+    "os=win&arch=other";
+  #endif
+#elif defined(OS_LINUX)
+  #if defined(__amd64__)
+    "os=linux&arch=x64";
+  #elif defined(__i386__)
+    "os=linux&arch=x86";
+  #else
+    "os=linux&arch=other";
+  #endif
+#elif defined(OS_CHROMEOS)
+  #if defined(__i386__)
+    "os=cros&arch=x86";
+  #else
+    "os=cros&arch=other";
+  #endif
+#else
+    "os=other&arch=other";

[asargent_no_longer_on_chrome, 2011/10/04 23:29:42]

Instead of using "other" here in the cases of new OS / architectures that this
code doesn't know about, would it be better to instead have:

#error "unknown os or architecture"

so that we'll get a compile error, and someone will have to think about what the
right thing is to put here?

+#endif
+
 }  // namespace
 
 class ChromeConfigurator : public ComponentUpdateService::Configurator {
@@ -44,6 +82,7 @@
   virtual int StepDelay() OVERRIDE;
   virtual int MinimumReCheckWait() OVERRIDE;
   virtual GURL UpdateUrl() OVERRIDE;
+  virtual const char* ExtraRequestParams() OVERRIDE;
   virtual size_t UrlSizeLimit() OVERRIDE;
   virtual net::URLRequestContextGetter* RequestContext() OVERRIDE;
   virtual bool InProcess() OVERRIDE;
@@ -53,6 +92,7 @@
   net::URLRequestContextGetter* url_request_getter_;
   bool fast_update_;
   bool out_of_process_;
+  std::string extra_info_;
 };
 
 ChromeConfigurator::ChromeConfigurator(const CommandLine* cmdline,
@@ -86,6 +126,10 @@
   return GURL("http://clients2.google.com/service/update2/crx");
 }
 
+const char* ChromeConfigurator::ExtraRequestParams() {
+  return kExtraInfo;
+}
+
 size_t ChromeConfigurator::UrlSizeLimit() {
   return 1024ul;
 }