Use new callbacks in the IqRequest interface.

remoting/jingle_glue/mock_objects.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.
 
 #include "base/memory/scoped_ptr.h"
 #include "remoting/jingle_glue/iq_request.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace remoting {
@@ skipping 12 matching lines @@
 };
 
 class MockIqRequest : public IqRequest {
  public:
   MockIqRequest();
   virtual ~MockIqRequest();
 
   MOCK_METHOD3(SendIq, void(const std::string& type,
                             const std::string& addressee,
                             buzz::XmlElement* iq_body));
-  MOCK_METHOD1(set_callback, void(IqRequest::ReplyCallback*));
+  MOCK_METHOD1(set_callback, void(const IqRequest::ReplyCallback&));
 
   // Ensure this takes ownership of the pointer, as the real IqRequest object
   // would, to avoid memory-leak.
-  void set_callback_hook(IqRequest::ReplyCallback* callback) {
-    callback_.reset(callback);
+  void set_callback_hook(const IqRequest::ReplyCallback& callback) {
+    callback_ = callback;
   }
 
   void Init() {
     ON_CALL(*this, set_callback(testing::_))
         .WillByDefault(testing::Invoke(
             this, &MockIqRequest::set_callback_hook));
   }
 
-  IqRequest::ReplyCallback* callback() { return callback_.get(); }
+  ReplyCallback& callback() { return callback_; }
 
  private:
-  scoped_ptr<IqRequest::ReplyCallback> callback_;
+  ReplyCallback callback_;
 };
 
 }  // namespace remoting