Remove weak pointers from CastSocket.

extensions/browser/api/cast_channel/cast_channel_apitest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 51 matching lines @@
 class MockCastSocket : public CastSocket {
  public:
   explicit MockCastSocket(CastSocket::Delegate* delegate,
                           net::IPEndPoint ip_endpoint,
                           net::NetLog* net_log)
     : CastSocket(kTestExtensionId, ip_endpoint,
                  cast_channel::CHANNEL_AUTH_TYPE_SSL, delegate, net_log,
                  base::TimeDelta::FromMilliseconds(kTimeoutMs)) {}
   virtual ~MockCastSocket() {}
 
-  virtual bool CalledOnValidThread() const OVERRIDE {
-    // Always return true in testing.
-    return true;
-  }
-
   MOCK_METHOD1(Connect, void(const net::CompletionCallback& callback));
   MOCK_METHOD2(SendMessage, void(const MessageInfo& message,
                                  const net::CompletionCallback& callback));
   MOCK_METHOD1(Close, void(const net::CompletionCallback& callback));
   MOCK_CONST_METHOD0(ready_state, cast_channel::ReadyState());
   MOCK_CONST_METHOD0(error_state, cast_channel::ChannelError());
 };
 
 }  // namespace
 
@@ skipping 288 matching lines @@
       cast_channel_send_function.get(),
       "[{\"channelId\": 1, \"url\": \"cast://127.0.0.1:8009\", "
       "\"connectInfo\": "
       "{\"ipAddress\": \"127.0.0.1\", \"port\": 8009, "
       "\"auth\": \"ssl\"}, \"readyState\": \"open\"}, "
       "{\"namespace_\": \"foo\", \"sourceId\": \"src\", "
       "\"destinationId\": \"\", \"data\": \"data\"}]",
       browser());
   EXPECT_EQ(error, "message_info.destination_id is required");
 }