Adds EngineGeolocationFeature for Blimp Geolocation project.

blimp/common/logging.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 "blimp/common/logging.h"
 
 #include <iostream>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 282 matching lines @@
                    message.blob_channel().transfer_blob().blob_id().size()),
                output);
       AddField("payload_size",
                message.blob_channel().transfer_blob().payload().size(), output);
       break;
     case BlobChannelMessage::TypeCase::TYPE_NOT_SET:  // unknown
       break;
   }
 }
 
+// Logs fields from GEOLOCATION messages.
+void ExtractGeolocationMessageFields(const BlimpMessage& message,
+                                     LogFields* output) {
+  switch (message.geolocation().type_case()) {
+    case GeolocationMessage::TypeCase::kUpdateListenState:
+      AddField("subtype", "UPDATE_LISTEN_STATE", output);
+      AddField("listen_state",
+               message.geolocation().update_listen_state().listen_state(),
+               output);
+      break;
+    case GeolocationMessage::TypeCase::kRequestRefresh:
+      AddField("subtype", "REQUEST_REFRESH", output);
+      break;
+    case GeolocationMessage::TypeCase::kLocation:
+      AddField("subtype", "LOCATION", output);
+      AddField("latitude", message.geolocation().location().latitude(), output);

[Wez, 2016/07/12 21:35:12]

nit: Take a local const& to message.geolocation.location() to make this code
more readable.

[CJ, 2016/07/13 21:49:19]

Done.

[Wez, 2016/07/14 01:19:21]

nit: I'd suggest taking the reference to location.coordinates() - then you'll
need a "long line" for |timestamp_millis| but the rest will be shorter and
easier to read.

[CJ, 2016/07/14 23:55:08]

Any draw back to leaving the location reference in as well?

+      AddField("longitude", message.geolocation().location().longitude(),
+               output);
+      AddField("altitude", message.geolocation().location().altitude(), output);
+      AddField("accuracy", message.geolocation().location().accuracy(), output);
+      AddField("altitude_accuracy",
+               message.geolocation().location().altitude_accuracy(), output);
+      AddField("heading", message.geolocation().location().heading(), output);
+      AddField("speed", message.geolocation().location().speed(), output);
+      AddField("timestamp_millis",
+               message.geolocation().location().timestamp_millis(), output);
+      break;
+    case GeolocationMessage::TypeCase::kError:
+      AddField("subtype", "ERROR", output);
+      AddField("error_code", message.geolocation().error().error_code(),
+               output);
+      AddField("error_message", message.geolocation().error().error_message(),
+               output);
+      break;
+    case GeolocationMessage::TypeCase::TYPE_NOT_SET:
+      break;
+  }
+}
+
 }  // namespace
 
 std::ostream& operator<<(std::ostream& out, const BlimpMessage& message) {
   LogFields fields;
 
   switch (message.feature_case()) {
     case BlimpMessage::kCompositor:
       AddField("type", "COMPOSITOR", &fields);
       ExtractCompositorMessageFields(message, &fields);
       break;
@@ skipping 22 matching lines @@
       ExtractTabControlMessageFields(message, &fields);
       break;
     case BlimpMessage::kBlobChannel:
       AddField("type", "BLOB_CHANNEL", &fields);
       ExtractBlobChannelMessageFields(message, &fields);
       break;
     case BlimpMessage::kIme:
       AddField("type", "IME", &fields);
       ExtractImeMessageFields(message, &fields);
       break;
+    case BlimpMessage::kGeolocation:
+      AddField("type", "GEOLOCATION", &fields);
+      ExtractGeolocationMessageFields(message, &fields);
+      break;
     case BlimpMessage::FEATURE_NOT_SET:
       AddField("type", "<UNKNOWN>", &fields);
       break;
   }
 
   // Append "target_tab_id" (if present) and "byte_size" to the field set.
   if (message.has_target_tab_id()) {
     AddField("target_tab_id", message.target_tab_id(), &fields);
   }
   AddField("byte_size", message.ByteSize(), &fields);
 
   // Format message using the syntax:
   // <BlimpMessage field1=value1 field2="value 2">
   out << "<BlimpMessage ";
   for (size_t i = 0; i < fields.size(); ++i) {
     out << fields[i].first << "=" << fields[i].second
         << (i != fields.size() - 1 ? " " : "");
   }
   out << ">";
 
   return out;
 }
 
 }  // namespace blimp