[CRD iOS] Fix telemetry issues

remoting/base/chromoting_event.cc

 // Copyright 2016 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 "remoting/base/chromoting_event.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/sys_info.h"
 #include "remoting/base/name_value_map.h"
@@ skipping 89 matching lines @@
 }
 
 void ChromotingEvent::AddSystemInfo() {
   SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture());
   SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion());
   SetString(kWebAppVersionKey, STRINGIZE(VERSION));
 #if defined(OS_LINUX)
   Os os = Os::CHROMOTING_LINUX;
 #elif defined(OS_CHROMEOS)
   Os os = Os::CHROMOTING_CHROMEOS;
+#elif defined(OS_IOS)
+  // This needs to precede the OS_MACOSX check since iOS will also define the
+  // OS_MACOSX macro.
+  Os os = Os::CHROMOTING_IOS;
 #elif defined(OS_MACOSX)
   Os os = Os::CHROMOTING_MAC;
 #elif defined(OS_WIN)
   Os os = Os::CHROMOTING_WINDOWS;
 #elif defined(OS_ANDROID)
   Os os = Os::CHROMOTING_ANDROID;
-#elif defined(OS_IOS)
-  Os os = Os::CHROMOTING_IOS;
 #else
   Os os = Os::OTHER;
 #endif
   SetEnum(kOsKey, os);
 }
 
 void ChromotingEvent::IncrementSendAttempts() {
   send_attempts_++;
 }
 
@@ skipping 14 matching lines @@
 ChromotingEvent::Os ChromotingEvent::ParseOsFromString(const std::string& os) {
   ChromotingEvent::Os result;
   if (!NameToValue(kOsNames, base::ToLowerASCII(os), &result)) {
     return Os::OTHER;
   }
 
   return result;
 }
 
 }  // namespace remoting