Fixed CPU info reporting on ChromeOS ARM.

base/sys_info_linux.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 "base/sys_info.h"
 
 #include <limits>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
     } else {
       NOTREACHED();
       return 0;
     }
   }
   return static_cast<size_t>(limit);
 }
 
 // static
 std::string SysInfo::CPUModelName() {
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+  const char kHardwarePrefix[] = "Hardware";
+#else
   const char kModelNamePrefix[] = "model name";
+#endif
   std::string contents;
   file_util::ReadFileToString(FilePath("/proc/cpuinfo"), &contents);
   DCHECK(!contents.empty());
   if (!contents.empty()) {
     std::istringstream iss(contents);
     std::string line;
-    while (std::getline(iss, line)){
+    while (std::getline(iss, line)) {
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)

[darin (slow to review), 2013/05/03 06:07:09]

nit: #ifdefs suck.  i'd be tempted to generalize this code into a helper
function that takes a string parameter.  that way you can just #ifdef once.

at the very least it seems like you could use a more generic local variable name
like kPrefix.

[zel, 2013/05/03 18:02:16]

Down to one #ifdef now. Even if I split this in a separate function, there will
be still one #ifdef somewhere else.

+      if (line.compare(0, strlen(kHardwarePrefix), kHardwarePrefix) == 0) {
+#else
       if (line.compare(0, strlen(kModelNamePrefix), kModelNamePrefix) == 0) {
+#endif
         size_t pos = line.find(": ");
         return line.substr(pos + 2);
       }
     }
   }
   return std::string();
 }
 
 }  // namespace base