Determine connection type in NetworkChangeNotifierLinux.

net/base/net_util.cc

 // Copyright (c) 2012 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/base/net_util.h"
 
 #include <errno.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 1019 matching lines @@
       interface_index(interface_index),
       type(type),
       address(address),
       prefix_length(prefix_length),
       ip_address_attributes(ip_address_attributes) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
+NetworkChangeNotifier::ConnectionType ConnectionTypeFromInterfaceList(

[pauljensen, 2015/01/15 15:05:10]

Please move to network_change_notifier.cc

[derekjchow1, 2015/01/15 20:32:51]

Done.

+    const NetworkInterfaceList& interfaces) {
+  if (interfaces.empty())
+    return NetworkChangeNotifier::CONNECTION_NONE;
+

[pauljensen, 2015/01/15 15:05:10]

Please rework this to ignore the terredo interface on windows as the copy I
linked to did.

[derekjchow1, 2015/01/15 20:32:51]

Done.

+  for (size_t i = 1; i < interfaces.size(); ++i) {
+    if (interfaces[i].type != interfaces[0].type)
+      return NetworkChangeNotifier::CONNECTION_UNKNOWN;
+  }
+  return interfaces[0].type;
+}
+
 unsigned CommonPrefixLength(const IPAddressNumber& a1,
                             const IPAddressNumber& a2) {
   DCHECK_EQ(a1.size(), a2.size());
   for (size_t i = 0; i < a1.size(); ++i) {
     unsigned diff = a1[i] ^ a2[i];
     if (!diff)
       continue;
     for (unsigned j = 0; j < CHAR_BIT; ++j) {
       if (diff & (1 << (CHAR_BIT - 1)))
         return i * CHAR_BIT + j;
       diff <<= 1;
     }
     NOTREACHED();
   }
   return a1.size() * CHAR_BIT;
 }
 
 unsigned MaskPrefixLength(const IPAddressNumber& mask) {
   IPAddressNumber all_ones(mask.size(), 0xFF);
   return CommonPrefixLength(mask, all_ones);
 }
 
 ScopedWifiOptions::~ScopedWifiOptions() {
 }
 
 }  // namespace net