Provide correct extra info for ChromeOS

chrome/browser/component_updater/component_updater_configurator.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 37 matching lines @@
      #error "unknown mac architecture"
   #endif
 #elif defined(OS_WIN)
   #if defined(_WIN64)
     "os=win&arch=x64&prod=chrome&prodversion=";
   #elif defined(_WIN32)
     "os=win&arch=x86&prod=chrome&prodversion=";
   #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
 
 }  // namespace
 
 class ChromeConfigurator : public ComponentUpdateService::Configurator {
  public:
   ChromeConfigurator(const CommandLine* cmdline,
                      net::URLRequestContextGetter* url_request_getter);
@@ skipping 94 matching lines @@
     default:
       NOTREACHED();
       break;
   }
 }
 
 ComponentUpdateService::Configurator* MakeChromeComponentUpdaterConfigurator(
     const CommandLine* cmdline, net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }