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

content/shell/test_runner/mock_web_user_media_client.cc

Index: content/shell/test_runner/mock_web_user_media_client.cc
diff --git a/components/test_runner/mock_web_user_media_client.cc b/content/shell/test_runner/mock_web_user_media_client.cc
similarity index 57%
rename from components/test_runner/mock_web_user_media_client.cc
rename to content/shell/test_runner/mock_web_user_media_client.cc
index 3eace861e01485854accfc885643644b0eeed7f9..19e514ffcd43aa367a4912bad382a36f4baf3195 100644
--- a/components/test_runner/mock_web_user_media_client.cc
+++ b/content/shell/test_runner/mock_web_user_media_client.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_web_user_media_client.h"
+#include "content/shell/test_runner/mock_web_user_media_client.h"
 
 #include <stddef.h>
 
@@ -10,7 +10,7 @@
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "components/test_runner/web_test_delegate.h"
+#include "content/shell/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
@@ -33,8 +33,7 @@ using blink::WebVector;
 
 namespace test_runner {
 
-class MockExtraData : public WebMediaStream::ExtraData {
-};
+class MockExtraData : public WebMediaStream::ExtraData {};
 
 MockWebUserMediaClient::MockWebUserMediaClient(WebTestDelegate* delegate)
     : delegate_(delegate),
@@ -45,53 +44,48 @@ MockWebUserMediaClient::~MockWebUserMediaClient() {}
 
 void MockWebUserMediaClient::requestUserMedia(
     const WebUserMediaRequest& stream_request) {
-    DCHECK(!stream_request.isNull());
-    WebUserMediaRequest request = stream_request;
-
-    if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
-      delegate_->PostTask(base::Bind(
-          &WebUserMediaRequest::requestFailed,
-          base::Owned(new WebUserMediaRequest(request)), WebString()));
-      return;
-    }
-
-    WebMediaStream stream;
-    stream.initialize(WebVector<WebMediaStreamTrack>(),
-                      WebVector<WebMediaStreamTrack>());
-    stream.setExtraData(new MockExtraData());
-
-    if (request.audio() &&
-        !delegate_->AddMediaStreamAudioSourceAndTrack(&stream)) {
-      WebMediaStreamSource source;
-      source.initialize("MockAudioDevice#1",
-                        WebMediaStreamSource::TypeAudio,
-                        "Mock audio device",
-                        false /* remote */);
-      WebMediaStreamTrack web_track;
-      web_track.initialize(source);
-      stream.addTrack(web_track);
-    }
-
-    if (request.video() &&
-        !delegate_->AddMediaStreamVideoSourceAndTrack(&stream)) {
-      WebMediaStreamSource source;
-      source.initialize("MockVideoDevice#1",
-                        WebMediaStreamSource::TypeVideo,
-                        "Mock video device",
-                        false /* remote */);
-      WebMediaStreamTrack web_track;
-      web_track.initialize(source);
-      stream.addTrack(web_track);
-    }
+  DCHECK(!stream_request.isNull());
+  WebUserMediaRequest request = stream_request;
 
+  if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
     delegate_->PostTask(
-        base::Bind(&WebUserMediaRequest::requestSucceeded,
-                   base::Owned(new WebUserMediaRequest(request)), stream));
+        base::Bind(&WebUserMediaRequest::requestFailed,
+                   base::Owned(new WebUserMediaRequest(request)), WebString()));
+    return;
+  }
+
+  WebMediaStream stream;
+  stream.initialize(WebVector<WebMediaStreamTrack>(),
+                    WebVector<WebMediaStreamTrack>());
+  stream.setExtraData(new MockExtraData());
+
+  if (request.audio() &&
+      !delegate_->AddMediaStreamAudioSourceAndTrack(&stream)) {
+    WebMediaStreamSource source;
+    source.initialize("MockAudioDevice#1", WebMediaStreamSource::TypeAudio,
+                      "Mock audio device", false /* remote */);
+    WebMediaStreamTrack web_track;
+    web_track.initialize(source);
+    stream.addTrack(web_track);
+  }
+
+  if (request.video() &&
+      !delegate_->AddMediaStreamVideoSourceAndTrack(&stream)) {
+    WebMediaStreamSource source;
+    source.initialize("MockVideoDevice#1", WebMediaStreamSource::TypeVideo,
+                      "Mock video device", false /* remote */);
+    WebMediaStreamTrack web_track;
+    web_track.initialize(source);
+    stream.addTrack(web_track);
+  }
+
+  delegate_->PostTask(base::Bind(&WebUserMediaRequest::requestSucceeded,
+                                 base::Owned(new WebUserMediaRequest(request)),
+                                 stream));
 }
 
 void MockWebUserMediaClient::cancelUserMediaRequest(
-    const WebUserMediaRequest&) {
-}
+    const WebUserMediaRequest&) {}
 
 void MockWebUserMediaClient::requestMediaDevices(
     const WebMediaDevicesRequest& request) {
@@ -101,30 +95,22 @@ void MockWebUserMediaClient::requestMediaDevices(
     const char* label;
     const char* group_id;
   } test_devices[] = {
-    {
-      "device1",
-      WebMediaDeviceInfo::MediaDeviceKindAudioInput,
-      "Built-in microphone",
-      "group1",
-    },
-    {
-      "device2",
-      WebMediaDeviceInfo::MediaDeviceKindAudioOutput,
-      "Built-in speakers",
-      "group1",
-    },
-    {
-      "device3",
-      WebMediaDeviceInfo::MediaDeviceKindVideoInput,
-      "Built-in webcam",
-      "group2",
-    },
-    {
-      "device4",
-      WebMediaDeviceInfo::MediaDeviceKindAudioInput,
-      "Extra microphone",
-      "group3",
-    },
+      {
+          "device1", WebMediaDeviceInfo::MediaDeviceKindAudioInput,
+          "Built-in microphone", "group1",
+      },
+      {
+          "device2", WebMediaDeviceInfo::MediaDeviceKindAudioOutput,
+          "Built-in speakers", "group1",
+      },
+      {
+          "device3", WebMediaDeviceInfo::MediaDeviceKindVideoInput,
+          "Built-in webcam", "group2",
+      },
+      {
+          "device4", WebMediaDeviceInfo::MediaDeviceKindAudioInput,
+          "Extra microphone", "group3",
+      },
   };
 
   size_t num_devices = should_enumerate_extra_device_