Fixed current OOBE captive portal metrics.

chrome/browser/chromeos/net/network_portal_detector_impl.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 24 matching lines @@
 
 // This class handles all notifications about network changes from
 // NetworkStateHandler and delegates portal detection for the default
 // network to CaptivePortalService.
 class NetworkPortalDetectorImpl
     : public NetworkPortalDetector,
       public base::NonThreadSafe,
       public chromeos::NetworkStateHandlerObserver,
       public content::NotificationObserver {
  public:
+  static const char kDetectionResultHistogram[];
+  static const char kDetectionDurationHistogram[];
+  static const char kShillOnlineHistogram[];
+  static const char kShillPortalHistogram[];
+  static const char kShillOfflineHistogram[];
+
   explicit NetworkPortalDetectorImpl(
       const scoped_refptr<net::URLRequestContextGetter>& request_context);
   virtual ~NetworkPortalDetectorImpl();
 
   // NetworkPortalDetector implementation:
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void AddAndFireObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual CaptivePortalState GetCaptivePortalState(
       const chromeos::NetworkState* network) OVERRIDE;
@@ skipping 125 matching lines @@
   // cancelled.
   bool DetectionTimeoutIsCancelledForTesting() const;
 
   // Returns timeout for current (or immediate) detection attempt.
   // The following rules are used for timeout computation:
   // * if default (active) network is NULL, kBaseRequestTimeoutSec is used
   // * if lazy detection mode is enabled, kLazyRequestTimeoutSec is used
   // * otherwise, timeout equals to |attempt_count_| * kBaseRequestTimeoutSec
   int GetRequestTimeoutSec() const;
 
+  // Record detection stats such as detection duration and detection
+  // result in UMA.
+  void RecordDetectionStats(const NetworkState* network,
+                            CaptivePortalStatus status);
+
   // Name of the default network.
   std::string default_network_name_;
 
   // Unique identifier of the default network.
   std::string default_network_id_;
 
   // Service path of the default network.
   std::string default_service_path_;
 
   // Connection state of the default network.
@@ skipping 49 matching lines @@
   bool request_timeout_for_testing_initialized_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_