Move //components/test_runner back into //content/shell

content/shell/test_runner/mock_webrtc_peer_connection_handler.cc

Index: content/shell/test_runner/mock_webrtc_peer_connection_handler.cc
diff --git a/components/test_runner/mock_webrtc_peer_connection_handler.cc b/content/shell/test_runner/mock_webrtc_peer_connection_handler.cc
similarity index 90%
rename from components/test_runner/mock_webrtc_peer_connection_handler.cc
rename to content/shell/test_runner/mock_webrtc_peer_connection_handler.cc
index 0b79863f1d454fc15fc56ba96378e8a71e8f8613..c2f4f10083d981d1e2a55331264052a247b6bd3a 100644
--- a/components/test_runner/mock_webrtc_peer_connection_handler.cc
+++ b/content/shell/test_runner/mock_webrtc_peer_connection_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/test_runner/mock_webrtc_peer_connection_handler.h"
+#include "content/shell/test_runner/mock_webrtc_peer_connection_handler.h"
 
 #include <stddef.h>
 
@@ -12,10 +12,10 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "components/test_runner/mock_webrtc_data_channel_handler.h"
-#include "components/test_runner/mock_webrtc_dtmf_sender_handler.h"
-#include "components/test_runner/test_interfaces.h"
-#include "components/test_runner/web_test_delegate.h"
+#include "content/shell/test_runner/mock_webrtc_data_channel_handler.h"
+#include "content/shell/test_runner/mock_webrtc_dtmf_sender_handler.h"
+#include "content/shell/test_runner/test_interfaces.h"
+#include "content/shell/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
@@ -70,9 +70,7 @@ class MockWebRTCLegacyStats : public blink::WebRTCLegacyStats {
       NOTREACHED();
       return false;
     }
-    blink::WebString valueToString() const override {
-      return valueString();
-    }
+    blink::WebString valueToString() const override { return valueString(); }
 
    private:
     size_t i = 0;
@@ -89,9 +87,7 @@ class MockWebRTCLegacyStats : public blink::WebRTCLegacyStats {
   blink::WebString type() const override {
     return blink::WebString::fromUTF8(type_name_);
   }
-  double timestamp() const override {
-    return timestamp_;
-  }
+  double timestamp() const override { return timestamp_; }
   blink::WebRTCLegacyStatsMemberIterator* iterator() const override {
     return new MemberIterator(&values_);
   }
@@ -108,24 +104,22 @@ class MockWebRTCLegacyStats : public blink::WebRTCLegacyStats {
   std::vector<std::pair<std::string, std::string>> values_;
 };
 
-template<typename T>
+template <typename T>
 WebVector<T> sequenceWithValue(T value) {
   return WebVector<T>(&value, 1);
 }
 
 class MockWebRTCStatsMember : public blink::WebRTCStatsMember {
  public:
-  MockWebRTCStatsMember(
-      const std::string& name, blink::WebRTCStatsMemberType type)
+  MockWebRTCStatsMember(const std::string& name,
+                        blink::WebRTCStatsMemberType type)
       : name_(name), type_(type) {}
 
   // blink::WebRTCStatsMember overrides.
   blink::WebString name() const override {
     return blink::WebString::fromUTF8(name_);
   }
-  blink::WebRTCStatsMemberType type() const override {
-    return type_;
-  }
+  blink::WebRTCStatsMemberType type() const override { return type_; }
   bool isDefined() const override { return true; }
   bool valueBool() const override { return true; }
   int32_t valueInt32() const override { return 42; }
@@ -166,10 +160,10 @@ class MockWebRTCStatsMember : public blink::WebRTCStatsMember {
 
 class MockWebRTCStats : public blink::WebRTCStats {
  public:
-  MockWebRTCStats(
-      const std::string& id, const std::string& type, double timestamp)
-      : id_(id), type_(type), timestamp_(timestamp) {
-  }
+  MockWebRTCStats(const std::string& id,
+                  const std::string& type,
+                  double timestamp)
+      : id_(id), type_(type), timestamp_(timestamp) {}
 
   void addMember(const std::string& name, blink::WebRTCStatsMemberType type) {
     members_.push_back(std::make_pair(name, type));
@@ -182,15 +176,11 @@ class MockWebRTCStats : public blink::WebRTCStats {
   blink::WebString type() const override {
     return blink::WebString::fromUTF8(type_);
   }
-  double timestamp() const override {
-    return timestamp_;
-  }
-  size_t membersCount() const override {
-    return members_.size();
-  }
+  double timestamp() const override { return timestamp_; }
+  size_t membersCount() const override { return members_.size(); }
   std::unique_ptr<WebRTCStatsMember> getMember(size_t i) const override {
-    return std::unique_ptr<WebRTCStatsMember>(new MockWebRTCStatsMember(
-        members_[i].first, members_[i].second));
+    return std::unique_ptr<WebRTCStatsMember>(
+        new MockWebRTCStatsMember(members_[i].first, members_[i].second));
   }
 
  private:
@@ -206,9 +196,7 @@ class MockWebRTCStatsReport : public blink::WebRTCStatsReport {
   MockWebRTCStatsReport(const MockWebRTCStatsReport& other)
       : stats_(other.stats_), i_(0) {}
 
-  void AddStats(const MockWebRTCStats& stats) {
-    stats_.push_back(stats);
-  }
+  void AddStats(const MockWebRTCStats& stats) { stats_.push_back(stats); }
 
   // blink::WebRTCStatsReport overrides.
   std::unique_ptr<blink::WebRTCStatsReport> copyHandle() const override {
@@ -241,8 +229,7 @@ class MockWebRTCStatsReport : public blink::WebRTCStatsReport {
 MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler()
     : weak_factory_(this) {}
 
-MockWebRTCPeerConnectionHandler::~MockWebRTCPeerConnectionHandler() {
-}
+MockWebRTCPeerConnectionHandler::~MockWebRTCPeerConnectionHandler() {}
 
 MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler(
     WebRTCPeerConnectionHandlerClient* client,
@@ -357,7 +344,6 @@ void MockWebRTCPeerConnectionHandler::setLocalDescription(
 void MockWebRTCPeerConnectionHandler::setRemoteDescription(
     const WebRTCVoidRequest& request,
     const WebRTCSessionDescription& remote_description) {
-
   if (!remote_description.isNull() && remote_description.sdp() == "remote") {
     UpdateRemoteStreams();
     remote_description_ = remote_description;
@@ -412,34 +398,31 @@ void MockWebRTCPeerConnectionHandler::UpdateRemoteStreams() {
 
     blink::WebVector<blink::WebMediaStreamTrack> local_audio_tracks;
     stream.audioTracks(local_audio_tracks);
-    blink::WebVector<blink::WebMediaStreamTrack>
-        remote_audio_tracks(local_audio_tracks.size());
+    blink::WebVector<blink::WebMediaStreamTrack> remote_audio_tracks(
+        local_audio_tracks.size());
 
     for (size_t i = 0; i < local_audio_tracks.size(); ++i) {
       blink::WebMediaStreamSource webkit_source;
       webkit_source.initialize(local_audio_tracks[i].id(),
                                blink::WebMediaStreamSource::TypeAudio,
-                               local_audio_tracks[i].id(),
-                               true /* remote */);
+                               local_audio_tracks[i].id(), true /* remote */);
       remote_audio_tracks[i].initialize(webkit_source);
     }
 
     blink::WebVector<blink::WebMediaStreamTrack> local_video_tracks;
     stream.videoTracks(local_video_tracks);
-    blink::WebVector<blink::WebMediaStreamTrack>
-        remote_video_tracks(local_video_tracks.size());
+    blink::WebVector<blink::WebMediaStreamTrack> remote_video_tracks(
+        local_video_tracks.size());
     for (size_t i = 0; i < local_video_tracks.size(); ++i) {
       blink::WebMediaStreamSource webkit_source;
       webkit_source.initialize(local_video_tracks[i].id(),
                                blink::WebMediaStreamSource::TypeVideo,
-                               local_video_tracks[i].id(),
-                               true /* remote */);
+                               local_video_tracks[i].id(), true /* remote */);
       remote_video_tracks[i].initialize(webkit_source);
     }
 
     blink::WebMediaStream new_remote_stream;
-    new_remote_stream.initialize(remote_audio_tracks,
-                                 remote_video_tracks);
+    new_remote_stream.initialize(remote_audio_tracks, remote_video_tracks);
     remote_streams_[added_it->first] = new_remote_stream;
     client_->didAddRemoteStream(new_remote_stream);
     ++added_it;
@@ -535,8 +518,8 @@ void MockWebRTCPeerConnectionHandler::getStats(
   stats.addMember("sequenceDouble", blink::WebRTCStatsMemberTypeSequenceDouble);
   stats.addMember("sequenceString", blink::WebRTCStatsMemberTypeSequenceString);
   report->AddStats(stats);
-  callback->OnStatsDelivered(std::unique_ptr<blink::WebRTCStatsReport>(
-      report.release()));
+  callback->OnStatsDelivered(
+      std::unique_ptr<blink::WebRTCStatsReport>(report.release()));
 }
 
 void MockWebRTCPeerConnectionHandler::ReportCreationOfDataChannel() {
@@ -556,8 +539,8 @@ WebRTCDataChannelHandler* MockWebRTCPeerConnectionHandler::createDataChannel(
 
   // TODO(lukasza): Unclear if it is okay to return a different object than the
   // one created in ReportCreationOfDataChannel.
-  return new MockWebRTCDataChannelHandler(
-      label, init, interfaces_->GetDelegate());
+  return new MockWebRTCDataChannelHandler(label, init,
+                                          interfaces_->GetDelegate());
 }
 
 WebRTCDTMFSenderHandler* MockWebRTCPeerConnectionHandler::createDTMFSender(