test_runner: Migrate MockWebRTCDataChannelHandler to Chromium C++ style.

Changes:
1) Run clang-format through source and header files.
2) Fix member variables names.
3) Rename file name to mock_webrtc_data_channel_handler.

BUG=360000
TEST=None. No functional changes.

Review URL: https://codereview.chromium.org/305923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274014 0039d316-1c4b-4281-b951-d872f2087c98

content/content_shell.gypi

@@ -185,8 +185,6 @@
         'shell/renderer/test_runner/MockWebMediaStreamCenter.h',
         'shell/renderer/test_runner/MockWebRTCDTMFSenderHandler.cpp',
         'shell/renderer/test_runner/MockWebRTCDTMFSenderHandler.h',
-        'shell/renderer/test_runner/MockWebRTCDataChannelHandler.cpp',
-        'shell/renderer/test_runner/MockWebRTCDataChannelHandler.h',
         'shell/renderer/test_runner/MockWebRTCPeerConnectionHandler.cpp',
         'shell/renderer/test_runner/MockWebRTCPeerConnectionHandler.h',
         'shell/renderer/test_runner/MockWebSpeechRecognizer.cpp',
@@ -222,6 +220,8 @@
         'shell/renderer/test_runner/mock_constraints.h',
         'shell/renderer/test_runner/mock_grammar_check.cc',
         'shell/renderer/test_runner/mock_grammar_check.h',
+        'shell/renderer/test_runner/mock_webrtc_data_channel_handler.cc',
+        'shell/renderer/test_runner/mock_webrtc_data_channel_handler.h',
         'shell/renderer/test_runner/notification_presenter.cc',
         'shell/renderer/test_runner/notification_presenter.h',
         'shell/renderer/test_runner/test_runner.cc',

content/shell/renderer/test_runner/MockWebRTCDataChannelHandler.cpp

-// Copyright 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/shell/renderer/test_runner/MockWebRTCDataChannelHandler.h"
-
-#include <assert.h>
-
-#include "content/shell/renderer/test_runner/WebTestDelegate.h"
-#include "third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h"
-
-using namespace blink;
-
-namespace content {
-
-class DataChannelReadyStateTask : public WebMethodTask<MockWebRTCDataChannelHandler> {
-public:
-    DataChannelReadyStateTask(MockWebRTCDataChannelHandler* object, WebRTCDataChannelHandlerClient* dataChannelClient, WebRTCDataChannelHandlerClient::ReadyState state)
-        : WebMethodTask<MockWebRTCDataChannelHandler>(object)
-        , m_dataChannelClient(dataChannelClient)
-        , m_state(state)
-    {
-    }
-
-    virtual void runIfValid() OVERRIDE
-    {
-        m_dataChannelClient->didChangeReadyState(m_state);
-    }
-
-private:
-    WebRTCDataChannelHandlerClient* m_dataChannelClient;
-    WebRTCDataChannelHandlerClient::ReadyState m_state;
-};
-
-/////////////////////
-
-MockWebRTCDataChannelHandler::MockWebRTCDataChannelHandler(WebString label, const WebRTCDataChannelInit& init, WebTestDelegate* delegate)
-    : m_client(0)
-    , m_label(label)
-    , m_init(init)
-    , m_delegate(delegate)
-{
-    m_reliable = (init.ordered && init.maxRetransmits == -1 && init.maxRetransmitTime == -1);
-}
-
-void MockWebRTCDataChannelHandler::setClient(WebRTCDataChannelHandlerClient* client)
-{
-    m_client = client;
-    if (m_client)
-        m_delegate->postTask(new DataChannelReadyStateTask(this, m_client, WebRTCDataChannelHandlerClient::ReadyStateOpen));
-}
-
-blink::WebString MockWebRTCDataChannelHandler::label()
-{
-    return m_label;
-}
-
-bool MockWebRTCDataChannelHandler::isReliable()
-{
-    return m_reliable;
-}
-
-bool MockWebRTCDataChannelHandler::ordered() const
-{
-    return m_init.ordered;
-}
-
-unsigned short MockWebRTCDataChannelHandler::maxRetransmitTime() const
-{
-    return m_init.maxRetransmitTime;
-}
-
-unsigned short MockWebRTCDataChannelHandler::maxRetransmits() const
-{
-    return m_init.maxRetransmits;
-}
-
-WebString MockWebRTCDataChannelHandler::protocol() const
-{
-    return m_init.protocol;
-}
-
-bool MockWebRTCDataChannelHandler::negotiated() const
-{
-    return m_init.negotiated;
-}
-
-unsigned short MockWebRTCDataChannelHandler::id() const
-{
-    return m_init.id;
-}
-
-unsigned long MockWebRTCDataChannelHandler::bufferedAmount()
-{
-    return 0;
-}
-
-bool MockWebRTCDataChannelHandler::sendStringData(const WebString& data)
-{
-    assert(m_client);
-    m_client->didReceiveStringData(data);
-    return true;
-}
-
-bool MockWebRTCDataChannelHandler::sendRawData(const char* data, size_t size)
-{
-    assert(m_client);
-    m_client->didReceiveRawData(data, size);
-    return true;
-}
-
-void MockWebRTCDataChannelHandler::close()
-{
-    assert(m_client);
-    m_delegate->postTask(new DataChannelReadyStateTask(this, m_client, WebRTCDataChannelHandlerClient::ReadyStateClosed));
-}
-
-}  // namespace content

content/shell/renderer/test_runner/MockWebRTCPeerConnectionHandler.cpp

@@ -5,10 +5,10 @@
 #include "content/shell/renderer/test_runner/MockWebRTCPeerConnectionHandler.h"
 
 #include "content/shell/renderer/test_runner/MockWebRTCDTMFSenderHandler.h"
-#include "content/shell/renderer/test_runner/MockWebRTCDataChannelHandler.h"
 #include "content/shell/renderer/test_runner/TestInterfaces.h"
 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
 #include "content/shell/renderer/test_runner/mock_constraints.h"
+#include "content/shell/renderer/test_runner/mock_webrtc_data_channel_handler.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

content/shell/renderer/test_runner/mock_webrtc_data_channel_handler.cc

+// 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.
+
+#include "content/shell/renderer/test_runner/mock_webrtc_data_channel_handler.h"
+
+#include <assert.h>
+
+#include "content/shell/renderer/test_runner/WebTestDelegate.h"
+#include "third_party/WebKit/public/platform/WebRTCDataChannelHandlerClient.h"
+
+using namespace blink;
+
+namespace content {
+
+class DataChannelReadyStateTask
+    : public WebMethodTask<MockWebRTCDataChannelHandler> {
+ public:
+  DataChannelReadyStateTask(MockWebRTCDataChannelHandler* object,
+                            WebRTCDataChannelHandlerClient* data_channel_client,
+                            WebRTCDataChannelHandlerClient::ReadyState state)
+      : WebMethodTask<MockWebRTCDataChannelHandler>(object),
+        data_channel_client_(data_channel_client),
+        state_(state) {}
+
+  virtual void runIfValid() OVERRIDE {
+    data_channel_client_->didChangeReadyState(state_);
+  }
+
+ private:
+  WebRTCDataChannelHandlerClient* data_channel_client_;
+  WebRTCDataChannelHandlerClient::ReadyState state_;
+};
+
+/////////////////////
+
+MockWebRTCDataChannelHandler::MockWebRTCDataChannelHandler(
+    WebString label,
+    const WebRTCDataChannelInit& init,
+    WebTestDelegate* delegate)
+    : client_(0), label_(label), init_(init), delegate_(delegate) {
+  reliable_ = (init.ordered && init.maxRetransmits == -1 &&
+               init.maxRetransmitTime == -1);
+}
+
+void MockWebRTCDataChannelHandler::setClient(
+    WebRTCDataChannelHandlerClient* client) {
+  client_ = client;
+  if (client_)
+    delegate_->postTask(new DataChannelReadyStateTask(
+        this, client_, WebRTCDataChannelHandlerClient::ReadyStateOpen));
+}
+
+blink::WebString MockWebRTCDataChannelHandler::label() {
+  return label_;
+}
+
+bool MockWebRTCDataChannelHandler::isReliable() {
+  return reliable_;
+}
+
+bool MockWebRTCDataChannelHandler::ordered() const {
+  return init_.ordered;
+}
+
+unsigned short MockWebRTCDataChannelHandler::maxRetransmitTime() const {
+  return init_.maxRetransmitTime;
+}
+
+unsigned short MockWebRTCDataChannelHandler::maxRetransmits() const {
+  return init_.maxRetransmits;
+}
+
+WebString MockWebRTCDataChannelHandler::protocol() const {
+  return init_.protocol;
+}
+
+bool MockWebRTCDataChannelHandler::negotiated() const {
+  return init_.negotiated;
+}
+
+unsigned short MockWebRTCDataChannelHandler::id() const {
+  return init_.id;
+}
+
+unsigned long MockWebRTCDataChannelHandler::bufferedAmount() {
+  return 0;
+}
+
+bool MockWebRTCDataChannelHandler::sendStringData(const WebString& data) {
+  assert(client_);
+  client_->didReceiveStringData(data);
+  return true;
+}
+
+bool MockWebRTCDataChannelHandler::sendRawData(const char* data, size_t size) {
+  assert(client_);
+  client_->didReceiveRawData(data, size);
+  return true;
+}
+
+void MockWebRTCDataChannelHandler::close() {
+  assert(client_);
+  delegate_->postTask(new DataChannelReadyStateTask(
+      this, client_, WebRTCDataChannelHandlerClient::ReadyStateClosed));
+}
+
+}  // namespace content

content/shell/renderer/test_runner/MockWebRTCDataChannelHandler.h → content/shell/renderer/test_runner/mock_webrtc_data_channel_handler.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -17,37 +17,39 @@ namespace content {
 class WebTestDelegate;
 
 class MockWebRTCDataChannelHandler : public blink::WebRTCDataChannelHandler {
-public:
-    MockWebRTCDataChannelHandler(blink::WebString label, const blink::WebRTCDataChannelInit&, WebTestDelegate*);
-
-    virtual void setClient(blink::WebRTCDataChannelHandlerClient*) OVERRIDE;
-    virtual blink::WebString label() OVERRIDE;
-    virtual bool isReliable() OVERRIDE;
-    virtual bool ordered() const OVERRIDE;
-    virtual unsigned short maxRetransmitTime() const OVERRIDE;
-    virtual unsigned short maxRetransmits() const OVERRIDE;
-    virtual blink::WebString protocol() const OVERRIDE;
-    virtual bool negotiated() const OVERRIDE;
-    virtual unsigned short id() const OVERRIDE;
-    virtual unsigned long bufferedAmount() OVERRIDE;
-    virtual bool sendStringData(const blink::WebString&) OVERRIDE;
-    virtual bool sendRawData(const char*, size_t) OVERRIDE;
-    virtual void close() OVERRIDE;
-
-    // WebTask related methods
-    WebTaskList* mutable_task_list() { return &m_taskList; }
-
-private:
-    MockWebRTCDataChannelHandler();
-
-    blink::WebRTCDataChannelHandlerClient* m_client;
-    blink::WebString m_label;
-    blink::WebRTCDataChannelInit m_init;
-    bool m_reliable;
-    WebTaskList m_taskList;
-    WebTestDelegate* m_delegate;
-
-    DISALLOW_COPY_AND_ASSIGN(MockWebRTCDataChannelHandler);
+ public:
+  MockWebRTCDataChannelHandler(blink::WebString label,
+                               const blink::WebRTCDataChannelInit&,
+                               WebTestDelegate*);
+
+  virtual void setClient(blink::WebRTCDataChannelHandlerClient*) OVERRIDE;
+  virtual blink::WebString label() OVERRIDE;
+  virtual bool isReliable() OVERRIDE;
+  virtual bool ordered() const OVERRIDE;
+  virtual unsigned short maxRetransmitTime() const OVERRIDE;
+  virtual unsigned short maxRetransmits() const OVERRIDE;
+  virtual blink::WebString protocol() const OVERRIDE;
+  virtual bool negotiated() const OVERRIDE;
+  virtual unsigned short id() const OVERRIDE;
+  virtual unsigned long bufferedAmount() OVERRIDE;
+  virtual bool sendStringData(const blink::WebString&) OVERRIDE;
+  virtual bool sendRawData(const char*, size_t) OVERRIDE;
+  virtual void close() OVERRIDE;
+
+  // WebTask related methods
+  WebTaskList* mutable_task_list() { return &task_list_; }
+
+ private:
+  MockWebRTCDataChannelHandler();
+
+  blink::WebRTCDataChannelHandlerClient* client_;
+  blink::WebString label_;
+  blink::WebRTCDataChannelInit init_;
+  bool reliable_;
+  WebTaskList task_list_;
+  WebTestDelegate* delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockWebRTCDataChannelHandler);
 };
 
 }  // namespace content