Move socket API from experimental to dev channel and remove some dead code

chrome/browser/extensions/api/socket/socket_api.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SOCKET_SOCKET_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SOCKET_SOCKET_API_H_
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/extensions/api/api_function.h"
 #include "chrome/browser/extensions/api/api_resource_manager.h"
-#include "chrome/common/extensions/api/experimental_socket.h"
+#include "chrome/common/extensions/api/socket.h"
 #include "net/base/address_list.h"
 #include "net/base/host_resolver.h"
 
 #include <string>
 
 class IOThread;
 
 namespace net {
 class IOBuffer;
 }
@@ skipping 34 matching lines @@
   // acquire it on the UI thread and then use it on the IO thread, so we keep a
   // plain pointer to it here as we move from thread to thread.
   IOThread* io_thread_;
 
   scoped_ptr<net::HostResolver::RequestHandle> request_handle_;
   scoped_ptr<net::AddressList> addresses_;
 };
 
 class SocketCreateFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.create")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.create")
 
   SocketCreateFunction();
 
  protected:
   virtual ~SocketCreateFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void Work() OVERRIDE;
 
  private:
   enum SocketType {
     kSocketTypeInvalid = -1,
     kSocketTypeTCP,
     kSocketTypeUDP
   };
 
-  scoped_ptr<api::experimental_socket::Create::Params> params_;
+  scoped_ptr<api::socket::Create::Params> params_;
   SocketType socket_type_;
   int src_id_;
   ApiResourceEventNotifier* event_notifier_;
 };
 
 class SocketDestroyFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.destroy")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.destroy")
 
  protected:
   virtual ~SocketDestroyFunction() {}
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void Work() OVERRIDE;
 
  private:
   int socket_id_;
 };
 
 class SocketConnectFunction : public SocketExtensionWithDnsLookupFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.connect")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.connect")
 
   SocketConnectFunction();
 
  protected:
   virtual ~SocketConnectFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void AsyncWorkStart() OVERRIDE;
 
   // SocketExtensionWithDnsLookupFunction:
   virtual void AfterDnsLookup(int lookup_result) OVERRIDE;
 
  private:
   void StartConnect();
   void OnConnect(int result);
 
   int socket_id_;
   std::string hostname_;
   int port_;
 };
 
 class SocketDisconnectFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.disconnect")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.disconnect")
 
  protected:
   virtual ~SocketDisconnectFunction() {}
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void Work() OVERRIDE;
 
  private:
   int socket_id_;
 };
 
 class SocketBindFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.bind")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.bind")
 
  protected:
   virtual ~SocketBindFunction() {}
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void Work() OVERRIDE;
 
  private:
   int socket_id_;
   std::string address_;
   int port_;
 };
 
 class SocketReadFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.read")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.read")
 
   SocketReadFunction();
 
  protected:
   virtual ~SocketReadFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void AsyncWorkStart() OVERRIDE;
   void OnCompleted(int result, scoped_refptr<net::IOBuffer> io_buffer);
 
  private:
-  scoped_ptr<api::experimental_socket::Read::Params> params_;
+  scoped_ptr<api::socket::Read::Params> params_;
 };
 
 class SocketWriteFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.write")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.write")
 
   SocketWriteFunction();
 
  protected:
   virtual ~SocketWriteFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void AsyncWorkStart() OVERRIDE;
   void OnCompleted(int result);
 
  private:
   int socket_id_;
   scoped_refptr<net::IOBuffer> io_buffer_;
   size_t io_buffer_size_;
 };
 
 class SocketRecvFromFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.recvFrom")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.recvFrom")
 
   SocketRecvFromFunction();
 
  protected:
   virtual ~SocketRecvFromFunction();
 
   // AsyncApiFunction
   virtual bool Prepare() OVERRIDE;
   virtual void AsyncWorkStart() OVERRIDE;
   void OnCompleted(int result,
                    scoped_refptr<net::IOBuffer> io_buffer,
                    const std::string& address,
                    int port);
 
  private:
-  scoped_ptr<api::experimental_socket::RecvFrom::Params> params_;
+  scoped_ptr<api::socket::RecvFrom::Params> params_;
 };
 
 class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.sendTo")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.sendTo")
 
   SocketSendToFunction();
 
  protected:
   virtual ~SocketSendToFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void AsyncWorkStart() OVERRIDE;
   void OnCompleted(int result);
 
   // SocketExtensionWithDnsLookupFunction:
   virtual void AfterDnsLookup(int lookup_result) OVERRIDE;
 
  private:
   void StartSendTo();
 
   int socket_id_;
   scoped_refptr<net::IOBuffer> io_buffer_;
   size_t io_buffer_size_;
   std::string hostname_;
   int port_;
 };
 
 class SocketSetKeepAliveFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.setKeepAlive")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.setKeepAlive")
 
   SocketSetKeepAliveFunction();
 
  protected:
   virtual ~SocketSetKeepAliveFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void Work() OVERRIDE;
 
  private:
-  scoped_ptr<api::experimental_socket::SetKeepAlive::Params> params_;
+  scoped_ptr<api::socket::SetKeepAlive::Params> params_;
 };
 
 class SocketSetNoDelayFunction : public SocketAsyncApiFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION_NAME("experimental.socket.setNoDelay")
+  DECLARE_EXTENSION_FUNCTION_NAME("socket.setNoDelay")
 
   SocketSetNoDelayFunction();
 
  protected:
   virtual ~SocketSetNoDelayFunction();
 
   // AsyncApiFunction:
   virtual bool Prepare() OVERRIDE;
   virtual void Work() OVERRIDE;
 
  private:
-  scoped_ptr<api::experimental_socket::SetNoDelay::Params> params_;
+  scoped_ptr<api::socket::SetNoDelay::Params> params_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SOCKET_SOCKET_API_H_