More net/ method ordering.

net/socket/client_socket.cc

 // Copyright (c) 2010 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 "net/socket/client_socket.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 48 matching lines @@
 }
 
 void ClientSocket::UseHistory::Reset() {
   EmitPreconnectionHistograms();
   was_ever_connected_ = false;
   was_used_to_convey_data_ = false;
   // omnibox_speculation_ and subresource_speculation_ values
   // are intentionally preserved.
 }
 
-void ClientSocket::UseHistory::EmitPreconnectionHistograms() const {
-  DCHECK(!subresource_speculation_ || !omnibox_speculation_);
-  // 0 ==> non-speculative, never connected.
-  // 1 ==> non-speculative never used (but connected).
-  // 2 ==> non-speculative and used.
-  // 3 ==> omnibox_speculative never connected.
-  // 4 ==> omnibox_speculative never used (but connected).
-  // 5 ==> omnibox_speculative and used.
-  // 6 ==> subresource_speculative never connected.
-  // 7 ==> subresource_speculative never used (but connected).
-  // 8 ==> subresource_speculative and used.
-  int result;
-  if (was_used_to_convey_data_)
-    result = 2;
-  else if (was_ever_connected_)
-    result = 1;
-  else
-    result = 0;  // Never used, and not really connected.
-
-  if (omnibox_speculation_)
-    result += 3;
-  else if (subresource_speculation_)
-    result += 6;
-  UMA_HISTOGRAM_ENUMERATION("Net.PreconnectUtilization2", result, 9);
-
-  static const bool connect_backup_jobs_fieldtrial =
-      base::FieldTrialList::Find("ConnnectBackupJobs") &&
-      !base::FieldTrialList::Find("ConnnectBackupJobs")->group_name().empty();
-  if (connect_backup_jobs_fieldtrial) {
-    UMA_HISTOGRAM_ENUMERATION(
-        base::FieldTrial::MakeName("Net.PreconnectUtilization2",
-                                   "ConnnectBackupJobs"),
-        result, 9);
-  }
-}
-
 void ClientSocket::UseHistory::set_was_ever_connected() {
   DCHECK(!was_used_to_convey_data_);
   was_ever_connected_ = true;
 }
 
 void ClientSocket::UseHistory::set_was_used_to_convey_data() {
   DCHECK(was_ever_connected_);
   was_used_to_convey_data_ = true;
 }
 
@@ skipping 22 matching lines @@
   if (was_used_to_convey_data_)
     return;
   omnibox_speculation_ = true;
 }
 
 bool ClientSocket::UseHistory::was_used_to_convey_data() const {
   DCHECK(!was_used_to_convey_data_ || was_ever_connected_);
   return was_used_to_convey_data_;
 }
 
+void ClientSocket::UseHistory::EmitPreconnectionHistograms() const {
+  DCHECK(!subresource_speculation_ || !omnibox_speculation_);
+  // 0 ==> non-speculative, never connected.
+  // 1 ==> non-speculative never used (but connected).
+  // 2 ==> non-speculative and used.
+  // 3 ==> omnibox_speculative never connected.
+  // 4 ==> omnibox_speculative never used (but connected).
+  // 5 ==> omnibox_speculative and used.
+  // 6 ==> subresource_speculative never connected.
+  // 7 ==> subresource_speculative never used (but connected).
+  // 8 ==> subresource_speculative and used.
+  int result;
+  if (was_used_to_convey_data_)
+    result = 2;
+  else if (was_ever_connected_)
+    result = 1;
+  else
+    result = 0;  // Never used, and not really connected.
+
+  if (omnibox_speculation_)
+    result += 3;
+  else if (subresource_speculation_)
+    result += 6;
+  UMA_HISTOGRAM_ENUMERATION("Net.PreconnectUtilization2", result, 9);
+
+  static const bool connect_backup_jobs_fieldtrial =
+      base::FieldTrialList::Find("ConnnectBackupJobs") &&
+      !base::FieldTrialList::Find("ConnnectBackupJobs")->group_name().empty();
+  if (connect_backup_jobs_fieldtrial) {
+    UMA_HISTOGRAM_ENUMERATION(
+        base::FieldTrial::MakeName("Net.PreconnectUtilization2",
+                                   "ConnnectBackupJobs"),
+        result, 9);
+  }
+}
+
 void ClientSocket::LogByteTransfer(const BoundNetLog& net_log,
                                    NetLog::EventType event_type,
                                    int byte_count,
                                    char* bytes) const {
   scoped_refptr<NetLog::EventParameters> params;
   if (net_log.IsLoggingBytes()) {
     params = new NetLogBytesTransferredParameter(byte_count, bytes);
   } else {
     params = new NetLogBytesTransferredParameter(byte_count, NULL);
   }
   net_log.AddEvent(event_type, params);
 }
 
 }  // namespace net