Change DtmfSenderHandler to handle events on the signaling thread.

content/renderer/media/rtc_dtmf_sender_handler.cc

 // Copyright (c) 2013 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 "content/renderer/media/rtc_dtmf_sender_handler.h"
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/location.h"
 #include "base/logging.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_checker.h"
 
 using webrtc::DtmfSenderInterface;
 
 namespace content {
 
+class RtcDtmfSenderHandler::Observer :
+    public base::RefCountedThreadSafe<Observer>,
+    public webrtc::DtmfSenderObserverInterface {
+ public:
+  explicit Observer(const base::WeakPtr<RtcDtmfSenderHandler>& handler)
+     : main_thread_(base::MessageLoopProxy::current()), handler_(handler) {}
+
+ private:
+  friend class base::RefCountedThreadSafe<Observer>;
+
+  ~Observer() override {}
+
+  void OnToneChange(const std::string& tone) override {
+    main_thread_->PostTask(FROM_HERE,
+        base::Bind(&RtcDtmfSenderHandler::Observer::OnToneChangeOnMainThread,
+                   this, tone));
+  }
+
+  void OnToneChangeOnMainThread(const std::string& tone) {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    if (handler_)
+      handler_->OnToneChange(tone);
+  }
+
+  base::ThreadChecker thread_checker_;
+  const scoped_refptr<base::MessageLoopProxy> main_thread_;

[tommi (sloooow) - chröme, 2014/11/03 13:49:56]

const scoped_refptr<base::SingleThreadTaskRunner> main_thread_; ?

[perkj_chrome, 2014/11/03 14:53:33]

Done.

+  base::WeakPtr<RtcDtmfSenderHandler> handler_;
+};
+
 RtcDtmfSenderHandler::RtcDtmfSenderHandler(DtmfSenderInterface* dtmf_sender)
     : dtmf_sender_(dtmf_sender),
-      webkit_client_(NULL) {
+      webkit_client_(NULL),
+      weak_factory_(this) {
   DVLOG(1) << "::ctor";
-  dtmf_sender_->RegisterObserver(this);
+  observer_ = new Observer(weak_factory_.GetWeakPtr());

[tommi (sloooow) - chröme, 2014/11/03 13:49:56]

nit: initializer list? (should be ok as long as it comes after weak_factory_

[perkj_chrome, 2014/11/03 14:53:33]

Done.

[dmichael (off chromium), 2014/12/04 19:28:46]

WeakPtrFactory should always be the last member...  see
crbug.com/303818
I'm working on some CLs to fix this up, but I wanted to let you guys know. You
can read the bug and/or comments in weak_ptr.h for an explanation.

+  dtmf_sender_->RegisterObserver(observer_.get());
 }
 
 RtcDtmfSenderHandler::~RtcDtmfSenderHandler() {
   DVLOG(1) << "::dtor";
   dtmf_sender_->UnregisterObserver();
 }
 
 void RtcDtmfSenderHandler::setClient(
     blink::WebRTCDTMFSenderHandlerClient* client) {
   webkit_client_ = client;
@@ skipping 18 matching lines @@
 void RtcDtmfSenderHandler::OnToneChange(const std::string& tone) {
   if (!webkit_client_) {
     LOG(ERROR) << "WebRTCDTMFSenderHandlerClient not set.";
     return;
   }
   webkit_client_->didPlayTone(base::UTF8ToUTF16(tone));
 }
 
 }  // namespace content