Cleanup network type matching.

chrome/browser/extensions/api/dial/dial_service.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 "chrome/browser/extensions/api/dial/dial_service.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 #include "url/gurl.h"
 #if defined(OS_CHROMEOS)
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "chromeos/network/shill_property_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 using net::HttpResponseHeaders;
 using net::HttpUtil;
 using net::IOBufferWithSize;
 using net::IPAddressNumber;
@@ skipping 68 matching lines @@
     const scoped_refptr<base::MessageLoopProxy>& loop,
     const base::Callback<void(const NetworkInterfaceList& networks)>& cb) {
   NetworkInterfaceList list;
   bool success = net::GetNetworkList(&list);
   if (!success)
     DVLOG(1) << "Could not retrieve network list!";
 
   loop->PostTask(FROM_HERE, base::Bind(cb, list));
 }
 
+#if defined(OS_CHROMEOS)
+IPAddressNumber GetBestBindAddressByType(
+    const chromeos::NetworkTypePattern& type) {
+  const chromeos::NetworkState* state = chromeos::NetworkHandler::Get()
+                                            ->network_state_handler()
+                                            ->ConnectedNetworkByType(type);

[stevenjb, 2013/09/04 20:40:39]

Is this from clang-format? It's kind of weird looking.

[pneubeck (no reviews), 2013/09/05 08:28:34]

yes. I changed it to two lines.

+  IPAddressNumber bind_ip_address;
+  if (!state ||
+      !net::ParseIPLiteralToNumber(state->ip_address(), &bind_ip_address)) {
+    return IPAddressNumber();
+  }
+  if (bind_ip_address.size() != net::kIPv4AddressSize) {
+    LOG(ERROR) << "Default network is not using IPv4.";
+    return IPAddressNumber();
+  }
+
+  DVLOG(1) << "Found " << state->type() << ", " << state->name() << ":"
+           << state->ip_address();
+  return bind_ip_address;
+}
+
+// Returns the IP address of the preferred interface to bind the socket. This
+// ChromeOS version can prioritize wifi and ethernet interfaces.
+IPAddressNumber GetBestBindAddressChromeOS() {
+  IPAddressNumber bind_ip_address =
+      GetBestBindAddressByType(chromeos::NetworkTypePattern::Ethernet());
+  if (bind_ip_address.empty()) {
+    bind_ip_address =
+        GetBestBindAddressByType(chromeos::NetworkTypePattern::WiFi());
+  }
+  return bind_ip_address;
+}
+#endif
+
 }  // namespace
 
 DialServiceImpl::DialServiceImpl(net::NetLog* net_log)
   : is_writing_(false),
     is_reading_(false),
     discovery_active_(false),
     num_requests_sent_(0),
     max_requests_(kDialMaxRequests),
     finish_delay_(TimeDelta::FromMilliseconds((kDialMaxRequests - 1) *
                                               kDialRequestIntervalMillis) +
@@ skipping 52 matching lines @@
   // information such as interface types (i.e. wifi vs cellular).
   BindSocketAndSendRequest(GetBestBindAddressChromeOS());
 #else
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(
       &GetNetworkListOnFileThread,
       base::MessageLoopProxy::current(), base::Bind(
           &DialServiceImpl::SendNetworkList, AsWeakPtr())));
 #endif
 }
 
-#if defined(OS_CHROMEOS)
-IPAddressNumber DialServiceImpl::GetBestBindAddressChromeOS() {
-  std::string connection_types[] =
-      {flimflam::kTypeWifi, flimflam::kTypeEthernet};
-  for (uint i = 0; i < arraysize(connection_types); ++i) {
-    IPAddressNumber bind_ip_address;
-    const chromeos::NetworkState* state =
-        chromeos::NetworkHandler::Get()->network_state_handler()->
-            ConnectedNetworkByType(connection_types[i]);
-    if (state &&
-        net::ParseIPLiteralToNumber(state->ip_address(), &bind_ip_address)) {
-      DCHECK(bind_ip_address.size() == net::kIPv4AddressSize);
-      DVLOG(1) << "Found " << state->type() << ", " << state->name() << ":"
-               << state->ip_address();
-      return bind_ip_address;
-    }
-  }
-  return IPAddressNumber();
-}
-#endif
-
 bool DialServiceImpl::BindSocketAndSendRequest(
       const IPAddressNumber& bind_ip_address) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!socket_.get());
 
   if (bind_ip_address.size() == 0) {
     DVLOG(1) << "Could not find a valid interface to bind.";
     FinishDiscovery();
     return false;
   }
@@ skipping 256 matching lines @@
     DVLOG(0) << "dial socket error: " << error_str;
     // TODO(justinlin): More granular socket errors.
     FOR_EACH_OBSERVER(
         Observer, observer_list_, OnError(this, DIAL_SERVICE_SOCKET_ERROR));
     return false;
   }
   return true;
 }
 
 }  // namespace extensions