Revert of Use standard ICE in Chromoting.

remoting/protocol/protocol_mock_objects.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 REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 #define REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_
 
 #include <map>
 #include <string>
 
@@ skipping 189 matching lines @@
   MockSession();
   ~MockSession() override;
 
   MOCK_METHOD1(SetEventHandler, void(Session::EventHandler* event_handler));
   MOCK_METHOD0(error, ErrorCode());
   MOCK_METHOD0(GetTransportChannelFactory, StreamChannelFactory*());
   MOCK_METHOD0(GetMultiplexedChannelFactory, StreamChannelFactory*());
   MOCK_METHOD0(jid, const std::string&());
   MOCK_METHOD0(candidate_config, const CandidateSessionConfig*());
   MOCK_METHOD0(config, const SessionConfig&());
-  MOCK_METHOD1(set_config_ptr, void(const SessionConfig* config));
-  void set_config(scoped_ptr<SessionConfig> config) override {
-    set_config_ptr(config.get());
-  }
+  MOCK_METHOD1(set_config, void(const SessionConfig& config));
   MOCK_METHOD0(initiator_token, const std::string&());
   MOCK_METHOD1(set_initiator_token, void(const std::string& initiator_token));
   MOCK_METHOD0(receiver_token, const std::string&());
   MOCK_METHOD1(set_receiver_token, void(const std::string& receiver_token));
   MOCK_METHOD1(set_shared_secret, void(const std::string& secret));
   MOCK_METHOD0(shared_secret, const std::string&());
   MOCK_METHOD0(Close, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSession);
@@ skipping 57 matching lines @@
   // Runs tasks synchronously instead of posting them to |task_runner|.
   void PostTask(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
                 const tracked_objects::Location& from_here,
                 const base::Closure& task) override;
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PROTOCOL_MOCK_OBJECTS_H_