Switch remoting/protocol to new callbacks

remoting/protocol/fake_session.h

 // Copyright (c) 2011 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 REMOTING_PROTOCOL_FAKE_SESSION_H_
 #define REMOTING_PROTOCOL_FAKE_SESSION_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 106 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(FakeUdpSocket);
 };
 
 // FakeSession is a dummy protocol::Session that uses FakeSocket for all
 // channels.
 class FakeSession : public Session {
  public:
   FakeSession();
   virtual ~FakeSession();
 
-  StateChangeCallback* state_change_callback() { return callback_.get(); }
+  const StateChangeCallback& state_change_callback() { return callback_; }
 
   void set_message_loop(MessageLoop* message_loop) {
     message_loop_ = message_loop;
   }
 
   void set_error(Session::Error error) { error_ = error; }
 
   bool is_closed() const { return closed_; }
 
   FakeSocket* GetStreamChannel(const std::string& name);
   FakeUdpSocket* GetDatagramChannel(const std::string& name);
 
   // Session interface.
-  virtual void SetStateChangeCallback(StateChangeCallback* callback);
+  virtual void SetStateChangeCallback(const StateChangeCallback& callback);
 
   virtual Session::Error error();
 
   virtual void CreateStreamChannel(
       const std::string& name, const StreamChannelCallback& callback);
   virtual void CreateDatagramChannel(
       const std::string& name, const DatagramChannelCallback& callback);
 
   virtual FakeSocket* control_channel();
   virtual FakeSocket* event_channel();
 
   virtual const std::string& jid();
 
   virtual const CandidateSessionConfig* candidate_config();
   virtual const SessionConfig& config();
   virtual void set_config(const SessionConfig& config);
 
   virtual const std::string& initiator_token();
   virtual void set_initiator_token(const std::string& initiator_token);
   virtual const std::string& receiver_token();
   virtual void set_receiver_token(const std::string& receiver_token);
 
   virtual void set_shared_secret(const std::string& secret);
   virtual const std::string& shared_secret();
 
   virtual void Close();
 
  public:
-  scoped_ptr<StateChangeCallback> callback_;
+  StateChangeCallback callback_;
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
   SessionConfig config_;
   MessageLoop* message_loop_;
   FakeSocket control_channel_;
   FakeSocket event_channel_;
 
   std::map<std::string, FakeSocket*> stream_channels_;
   std::map<std::string, FakeUdpSocket*> datagram_channels_;
 
   std::string initiator_token_;
   std::string receiver_token_;
 
   std::string shared_secret_;
 
   std::string jid_;
 
   Session::Error error_;
   bool closed_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_FAKE_SESSION_H_