Cleanup: Rename to base::SysInfo::CPUArchitecture() to OperatingSystemArchitecture().

Review URL: https://chromiumcodereview.appspot.com/11140015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162041 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.cc b/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.cc
index 53e41dc..f2eaa1d 100644
--- a/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.cc
+++ b/chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.cc
@@ -39,7 +39,7 @@ bool CpuInfoProvider::QueryInfo(CpuInfo* info) {
     return false;
 
   info->num_of_processors = base::SysInfo::NumberOfProcessors();
-  info->arch_name = base::SysInfo::CPUArchitecture();
+  info->arch_name = base::SysInfo::OperatingSystemArchitecture();
   info->model_name = base::SysInfo::CPUModelName();
   return true;
 }
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index 2c4b85b..31e5c98 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -670,7 +670,7 @@ void MetricsLog::RecordEnvironment(
     // Write the XML version.
     // We'll write the protobuf version in RecordEnvironmentProto().
     OPEN_ELEMENT_FOR_SCOPE("cpu");
-    WriteAttribute("arch", base::SysInfo::CPUArchitecture());
+    WriteAttribute("arch", base::SysInfo::OperatingSystemArchitecture());
   }
 
   {
@@ -765,7 +765,7 @@ void MetricsLog::RecordEnvironmentProto(
       content::GetContentClient()->browser()->GetApplicationLocale());
 
   SystemProfileProto::Hardware* hardware = system_profile->mutable_hardware();
-  hardware->set_cpu_architecture(base::SysInfo::CPUArchitecture());
+  hardware->set_cpu_architecture(base::SysInfo::OperatingSystemArchitecture());
   hardware->set_system_ram_mb(base::SysInfo::AmountOfPhysicalMemoryMB());
 #if defined(OS_WIN)
   hardware->set_dll_base(reinterpret_cast<uint64>(&__ImageBase));
@@ -866,7 +866,7 @@ void MetricsLog::WriteProfileMetrics(const std::string& profileidhash,
        i != profile_metrics.end_keys(); ++i) {
     const Value* value;
     if (profile_metrics.GetWithoutPathExpansion(*i, &value)) {
-      DCHECK(*i != "id");
+      DCHECK_NE(*i, "id");
       switch (value->GetType()) {
         case Value::TYPE_STRING: {
           std::string string_value;
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc
index c985447..961b04f 100644
--- a/chrome/browser/policy/device_management_service.cc
+++ b/chrome/browser/policy/device_management_service.cc
@@ -59,14 +59,14 @@ const int kInvalidArgument = 400;
 const int kInvalidAuthCookieOrDMToken = 401;
 const int kMissingLicenses = 402;
 const int kDeviceManagementNotAllowed = 403;
-const int kInvalidURL = 404; // This error is not coming from the GFE.
+const int kInvalidURL = 404;  // This error is not coming from the GFE.
 const int kInvalidSerialNumber = 405;
 const int kDeviceIdConflict = 409;
 const int kDeviceNotFound = 410;
 const int kPendingApproval = 412;
 const int kInternalServerError = 500;
 const int kServiceUnavailable = 503;
-const int kPolicyNotFound = 902; // This error is not sent as HTTP status code.
+const int kPolicyNotFound = 902;  // This error is not sent as HTTP status code.
 
 #if defined(OS_CHROMEOS)
 // Machine info keys.
@@ -139,7 +139,7 @@ const std::string& GetPlatformString() {
     return platform;
 
   std::string os_name(base::SysInfo::OperatingSystemName());
-  std::string os_hardware(base::SysInfo::CPUArchitecture());
+  std::string os_hardware(base::SysInfo::OperatingSystemArchitecture());
 
 #if defined(OS_CHROMEOS)
   chromeos::system::StatisticsProvider* provider =