Remove weak pointers from CastSocket.

extensions/browser/api/cast_channel/cast_channel_api.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
 #define EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 80 matching lines @@
   cast_channel::CastSocket* GetSocketOrCompleteWithError(int channel_id);
 
   // Adds |socket| to |manager_| and returns the new channel_id.  |manager_|
   // assumes ownership of |socket|.
   int AddSocket(cast_channel::CastSocket* socket);
 
   // Removes the CastSocket corresponding to |channel_id| from the resource
   // manager.
   void RemoveSocket(int channel_id);
 
-  // Sets the function result to a ChannelInfo obtained from the state of the
-  // CastSocket corresponding to |channel_id|.
-  void SetResultFromSocket(int channel_id);
+  // Sets the function result to a ChannelInfo obtained from the state of
+  // |socket|.
+  void SetResultFromSocket(const cast_channel::CastSocket& socket);
 
-  // Sets the function result to a ChannelInfo with |error|.
-  void SetResultFromError(cast_channel::ChannelError error);
+  // Sets the function result to a ChannelInfo populated with |channel_id| and
+  // |error|.
+  void SetResultFromError(int channel_id, cast_channel::ChannelError error);
 
   // Returns the socket corresponding to |channel_id| if one exists, or null
   // otherwise.
   cast_channel::CastSocket* GetSocket(int channel_id);
 
  private:
   // Sets the function result from |channel_info|.
   void SetResultFromChannelInfo(const cast_channel::ChannelInfo& channel_info);
 
   // The API resource manager for CastSockets.
@@ skipping 82 matching lines @@
   void OnClose(int result);
 
   scoped_ptr<cast_channel::Close::Params> params_;
 
   DISALLOW_COPY_AND_ASSIGN(CastChannelCloseFunction);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_