[cast_channel] Make CastMessageHandler a CastSocket::Observer instead of CastTransport::Delegate

components/cast_channel/cast_test_util.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 COMPONENTS_CAST_CHANNEL_CAST_TEST_UTIL_H_
 #define COMPONENTS_CAST_CHANNEL_CAST_TEST_UTIL_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 36 matching lines @@
   ~MockCastTransportDelegate() override;
 
   MOCK_METHOD1(OnError, void(ChannelError error));
   MOCK_METHOD1(OnMessage, void(const CastMessage& message));
   MOCK_METHOD0(Start, void(void));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockCastTransportDelegate);
 };
 
+class MockCastSocketObserver : public CastSocket::Observer {
+ public:
+  MockCastSocketObserver();
+  ~MockCastSocketObserver() override;
+
+  MOCK_METHOD2(OnError, void(const CastSocket& socket, ChannelError error));
+  MOCK_METHOD2(OnMessage,
+               void(const CastSocket& socket, const CastMessage& message));
+};
+
 class MockCastSocket : public CastSocket {
  public:
   MockCastSocket();
   ~MockCastSocket() override;
 
-  // Mockable version of Connect. Accepts a bare pointer to a mock object.
-  // (GMock won't compile with scoped_ptr method parameters.)
-  MOCK_METHOD2(ConnectRawPtr,
-               void(CastTransport::Delegate* delegate,
-                    base::Callback<void(ChannelError)> callback));
-
-  // Proxy for ConnectRawPtr. Unpacks scoped_ptr into a GMock-friendly bare
-  // ptr.
-  void Connect(std::unique_ptr<CastTransport::Delegate> delegate,
-               base::Callback<void(ChannelError)> callback) override {
-    delegate_ = std::move(delegate);
-    ConnectRawPtr(delegate_.get(), callback);
-  }
-
+  MOCK_METHOD1(Connect, void(base::Callback<void(ChannelError)> callback));
   MOCK_METHOD1(Close, void(const net::CompletionCallback& callback));
   MOCK_CONST_METHOD0(ip_endpoint, const net::IPEndPoint&());
   MOCK_CONST_METHOD0(id, int());
   MOCK_METHOD1(set_id, void(int id));
   MOCK_CONST_METHOD0(ready_state, ReadyState());
   MOCK_CONST_METHOD0(error_state, ChannelError());
   MOCK_CONST_METHOD0(keep_alive, bool(void));
   MOCK_CONST_METHOD0(audio_only, bool(void));
   MOCK_METHOD1(SetErrorState, void(ChannelError error_state));
+  MOCK_METHOD1(AddObserver, void(Observer* observer));
 
   CastTransport* transport() const override { return mock_transport_.get(); }
 
   MockCastTransport* mock_transport() const { return mock_transport_.get(); }
 
  private:
   std::unique_ptr<MockCastTransport> mock_transport_;
-  std::unique_ptr<CastTransport::Delegate> delegate_;
+  std::unique_ptr<Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCastSocket);
 };
 
 // Creates the IPEndpoint 192.168.1.1.
 net::IPEndPoint CreateIPEndPointForTest();
 
 // Checks if two proto messages are the same.
 // From
 // third_party/cacheinvalidation/overrides/google/cacheinvalidation/deps/gmock.h
 // TODO(kmarshall): promote to a shared testing library.
 MATCHER_P(EqualsProto, message, "") {
   std::string expected_serialized, actual_serialized;
   message.SerializeToString(&expected_serialized);
   arg.SerializeToString(&actual_serialized);
   return expected_serialized == actual_serialized;
 }
 
 ACTION_TEMPLATE(PostCompletionCallbackTask,
                 HAS_1_TEMPLATE_PARAMS(int, cb_idx),
                 AND_1_VALUE_PARAMS(rv)) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(testing::get<cb_idx>(args), rv));
 }
 
 }  // namespace cast_channel
 
 #endif  // COMPONENTS_CAST_CHANNEL_CAST_TEST_UTIL_H_