Ignore uninteresting events when recording the last errors to report

extensions/browser/api/cast_channel/logger.cc

 // Copyright 2014 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 "extensions/browser/api/cast_channel/logger.h"
 
+#include <string>
+
 #include "base/strings/string_util.h"
 #include "base/time/tick_clock.h"
 #include "extensions/browser/api/cast_channel/cast_auth_util.h"
 #include "extensions/browser/api/cast_channel/logger_util.h"
 #include "net/base/net_errors.h"
 #include "third_party/zlib/zlib.h"
 
 namespace extensions {
 namespace core_api {
 namespace cast_channel {
@@ skipping 74 matching lines @@
 
   result = deflateEnd(&stream);
   DCHECK(result == Z_OK || result == Z_DATA_ERROR);
 
   if (success)
     *length = out_size - stream.avail_out;
 
   return out.Pass();
 }
 
+// Returns true if the event type should be reported to the API as the last
+// socket event before an error occurred.  Some events are not interesting and
+// should be ignored.
+bool IsInterestingEventType(EventType type) {
+  switch (type) {
+    case proto::READY_STATE_CHANGED:
+    case proto::ERROR_STATE_CHANGED:

[imcheng, 2014/09/17 22:34:08]

Are other state changes (read/write/connect states) interesting? It seems to me
that an event is considered interesting if it has at least one of net return
value (!= net::IO_PENDING), challenge reply type, or NSS error code.

[mark a. foltz, 2014/10/09 23:51:42]

Changed this to just check for errors set as you mention.  That makes a lot more
sense, thanks!

+    case proto::NOTIFY_ON_MESSAGE:
+    case proto::NOTIFY_ON_ERROR:
+      return false;
+    default:
+      return true;
+  }
+}
+
 }  // namespace
 
 Logger::AggregatedSocketEventLog::AggregatedSocketEventLog() {
 }
 
 Logger::AggregatedSocketEventLog::~AggregatedSocketEventLog() {
 }
 
 Logger::Logger(scoped_ptr<base::TickClock> clock,
                base::TimeTicks unix_epoch_time_ticks)
@@ skipping 172 matching lines @@
   }
 
   std::deque<proto::SocketEvent>& socket_events = it->second->socket_events;
   if (socket_events.size() >= kMaxEventsPerSocket) {
     socket_events.pop_front();
     log_.set_num_evicted_socket_events(log_.num_evicted_socket_events() + 1);
   }
 
   socket_events.push_back(socket_event);
 
-  it->second->last_errors.event_type = socket_event.type();
-  if (socket_event.has_net_return_value()) {
+  if (IsInterestingEventType(socket_event.type())) {
+    it->second->last_errors.event_type = socket_event.type();
+  }
+  if (socket_event.has_net_return_value() &&
+      socket_event.net_return_value() != net::ERR_IO_PENDING) {
     it->second->last_errors.net_return_value = socket_event.net_return_value();
   }
   if (socket_event.has_challenge_reply_error_type()) {
     it->second->last_errors.challenge_reply_error_type =
         socket_event.challenge_reply_error_type();
   }
   if (socket_event.has_nss_error_code())
     it->second->last_errors.nss_error_code = socket_event.nss_error_code();
 
   return it->second->aggregated_socket_event;
@@ skipping 44 matching lines @@
   AggregatedSocketEventLogMap::const_iterator it =
       aggregated_socket_events_.find(channel_id);
   if (it != aggregated_socket_events_.end()) {
     return it->second->last_errors;
   } else {
     return LastErrors();
   }
 }
 
 }  // namespace cast_channel
-}  // namespace api
+}  // namespace core_api
 }  // namespace extensions