Provide correct extra info for ChromeOS

chrome/browser/component_updater/component_updater_configurator.cc

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 c53f62aa416b5bb5f96072a361b94e35eb01b042..aff33e7350b57ed4a3b22c6fef416a517674337f 100644
--- a/chrome/browser/component_updater/component_updater_configurator.cc
+++ b/chrome/browser/component_updater/component_updater_configurator.cc
@@ -55,21 +55,24 @@ const char kExtraInfo[] =
   #else
     #error "unknown windows architecture"
   #endif
+#elif defined(OS_CHROMEOS)
+  #if defined(__i386__)
+    "os=cros&arch=x86&prod=chrome&prodversion=";
+  #elif defined(__arm__)
+    "os=cros&arch=arm&prod=chrome&prodversion=";
+  #else
+    "os=cros&arch=unknown&prod=chrome&prodversion=";
+  #endif
 #elif defined(OS_LINUX)
   #if defined(__amd64__)
     "os=linux&arch=x64&prod=chrome&prodversion=";
   #elif defined(__i386__)
     "os=linux&arch=x86&prod=chrome&prodversion=";
+  #elif defined(__arm__)
+    "os=linux&arch=arm&prod=chrome&prodversion=";
   #else
     "os=linux&arch=unknown&prod=chrome&prodversion=";
   #endif
-#elif defined(OS_CHROMEOS)
-  #if defined(__i386__)
-    "os=cros&arch=x86&prod=chrome&prodversion=";
-  #else

[cpu_(ooo_6.6-7.5), 2011/10/17 01:11:44]

but I thought that chromeos also defines OS_LINUX so it seems it enters at 59
and never hits 67

[stevenjb, 2011/10/17 17:26:11]

That's correct, OS_CHROMEOS also defins OS_LINUX. The old code would only ever
enter the OS_LINUX section and never hit the OS_CHROMEOS section. This change is
to put OS_CHROMEOS first so that it does get entered instead of OS_LINUX.

-    // TODO(cpu): Fix this for ARM.
-    "os=cros&arch=unknown&prod=chrome&prodversion=";
-  #endif
 #else
     #error "unknown os or architecture"
 #endif