Domain Reliability: More security review.

components/domain_reliability/util.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 "components/domain_reliability/util.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "net/base/net_errors.h"
 
 namespace domain_reliability {
 
 namespace {
 
 class ActualTimer : public MockableTime::Timer {
  public:
   // Initialize base timer with retain_user_info and is_repeating false.
   ActualTimer() : base_timer_(false, false) {}
+
   virtual ~ActualTimer() {}
 
   // MockableTime::Timer implementation:
   virtual void Start(const tracked_objects::Location& posted_from,
                      base::TimeDelta delay,
                      const base::Closure& user_task) OVERRIDE {
     base_timer_.Start(posted_from, delay, user_task);
   }
 
   virtual void Stop() OVERRIDE {
@@ skipping 37 matching lines @@
   { net::ERR_SPDY_PROTOCOL_ERROR, "spdy.protocol" },
   { net::ERR_QUIC_PROTOCOL_ERROR, "quic.protocol" },
   { net::ERR_DNS_MALFORMED_RESPONSE, "dns.protocol" },
   { net::ERR_DNS_SERVER_FAILED, "dns.server" },
   { net::ERR_DNS_TIMED_OUT, "dns.timed_out" },
 };
 
 }  // namespace
 
 // static
-bool DomainReliabilityUtil::GetBeaconStatus(
+bool GetDomainReliabilityBeaconStatus(
     int net_error,
     int http_response_code,
     std::string* beacon_status_out) {
   if (net_error == net::OK) {
     if (http_response_code >= 400 && http_response_code < 600)
       *beacon_status_out = base::StringPrintf("http.%d", http_response_code);
     else
       *beacon_status_out = "ok";
     return true;
-  } else {
-    for (size_t i = 0; i < arraysize(net_error_map); i++) {
-      if (net_error_map[i].net_error == net_error) {
-        *beacon_status_out = net_error_map[i].beacon_status;
-        return true;
-      }
+  }
+
+  // TODO(ttuttle): Consider sorting and using binary search?
+  for (size_t i = 0; i < arraysize(net_error_map); i++) {
+    if (net_error_map[i].net_error == net_error) {
+      *beacon_status_out = net_error_map[i].beacon_status;
+      return true;
     }
-    return false;
   }
+  return false;
 }
 
 MockableTime::Timer::~Timer() {}
 MockableTime::Timer::Timer() {}
 
 MockableTime::~MockableTime() {}
 MockableTime::MockableTime() {}
 
 ActualTime::ActualTime() {}
 ActualTime::~ActualTime() {}
 
 base::Time ActualTime::Now() { return base::Time::Now(); }
 base::TimeTicks ActualTime::NowTicks() { return base::TimeTicks::Now(); }
 
 scoped_ptr<MockableTime::Timer> ActualTime::CreateTimer() {
   return scoped_ptr<MockableTime::Timer>(new ActualTimer());
 }
 
 }  // namespace domain_reliability