Allow missing socketType in SocketInfo if socket is not connected

chrome/browser/extensions/api/socket/socket_api.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/socket/socket_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/hash_tables.h"
@@ skipping 598 matching lines @@
 
 SocketGetInfoFunction::~SocketGetInfoFunction() {}
 
 bool SocketGetInfoFunction::Prepare() {
   params_ = api::socket::GetInfo::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
   return true;
 }
 
 void SocketGetInfoFunction::Work() {
+  Socket* socket = GetSocket(params_->socket_id);
+  if (!socket) {
+    error_ = kSocketNotFoundError;
+    return;
+  }
+
   api::socket::SocketInfo info;
-  Socket* socket = GetSocket(params_->socket_id);
-  if (socket) {
-    // This represents what we know about the socket, and does not call through
-    // to the system.
-    if (socket->GetSocketType() == Socket::TYPE_TCP)
-      info.socket_type = extensions::api::socket::SOCKET_TYPE_TCP;
-    else
-      info.socket_type = extensions::api::socket::SOCKET_TYPE_UDP;
-    info.connected = socket->IsConnected();
+  // This represents what we know about the socket, and does not call through
+  // to the system.
+  if (socket->GetSocketType() == Socket::TYPE_TCP)
+    info.socket_type = extensions::api::socket::SOCKET_TYPE_TCP;
+  else
+    info.socket_type = extensions::api::socket::SOCKET_TYPE_UDP;
+  info.connected = socket->IsConnected();
 
-    // Grab the peer address as known by the OS. This and the call below will
-    // always succeed while the socket is connected, even if the socket has
-    // been remotely closed by the peer; only reading the socket will reveal
-    // that it should be closed locally.
-    net::IPEndPoint peerAddress;
-    if (socket->GetPeerAddress(&peerAddress)) {
-      info.peer_address.reset(
-          new std::string(peerAddress.ToStringWithoutPort()));
-      info.peer_port.reset(new int(peerAddress.port()));
-    }
+  // Grab the peer address as known by the OS. This and the call below will
+  // always succeed while the socket is connected, even if the socket has
+  // been remotely closed by the peer; only reading the socket will reveal
+  // that it should be closed locally.
+  net::IPEndPoint peerAddress;
+  if (socket->GetPeerAddress(&peerAddress)) {
+    info.peer_address.reset(
+        new std::string(peerAddress.ToStringWithoutPort()));
+    info.peer_port.reset(new int(peerAddress.port()));
+  }
 
-    // Grab the local address as known by the OS.
-    net::IPEndPoint localAddress;
-    if (socket->GetLocalAddress(&localAddress)) {
-      info.local_address.reset(
-          new std::string(localAddress.ToStringWithoutPort()));
-      info.local_port.reset(new int(localAddress.port()));
-    }
-  } else {
-    error_ = kSocketNotFoundError;
+  // Grab the local address as known by the OS.
+  net::IPEndPoint localAddress;
+  if (socket->GetLocalAddress(&localAddress)) {
+    info.local_address.reset(
+        new std::string(localAddress.ToStringWithoutPort()));
+    info.local_port.reset(new int(localAddress.port()));
   }
+
   SetResult(info.ToValue().release());
 }
 
 bool SocketGetNetworkListFunction::RunImpl() {
   content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&SocketGetNetworkListFunction::GetNetworkListOnFileThread,
           this));
   return true;
 }
 
@@ skipping 232 matching lines @@
     return;
   }
 
   base::ListValue* values = new base::ListValue();
   values->AppendStrings((std::vector<std::string>&)
       static_cast<UDPSocket*>(socket)->GetJoinedGroups());
   SetResult(values);
 }
 
 }  // namespace extensions