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

content/shell/test_runner/accessibility_controller.cc

Index: content/shell/test_runner/accessibility_controller.cc
diff --git a/components/test_runner/accessibility_controller.cc b/content/shell/test_runner/accessibility_controller.cc
similarity index 89%
rename from components/test_runner/accessibility_controller.cc
rename to content/shell/test_runner/accessibility_controller.cc
index 84bf61a3f1c8f9d9982d429f3d7c3f137871dae9..c12f350c5451123f0df7b877d40ad6eaef542d52 100644
--- a/components/test_runner/accessibility_controller.cc
+++ b/content/shell/test_runner/accessibility_controller.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/test_runner/accessibility_controller.h"
+#include "content/shell/test_runner/accessibility_controller.h"
 
 #include "base/macros.h"
-#include "components/test_runner/web_view_test_proxy.h"
+#include "content/shell/test_runner/web_view_test_proxy.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
@@ -63,9 +63,8 @@ void AccessibilityControllerBindings::Install(
 
   v8::Context::Scope context_scope(context);
 
-  gin::Handle<AccessibilityControllerBindings> bindings =
-      gin::CreateHandle(isolate,
-                        new AccessibilityControllerBindings(controller));
+  gin::Handle<AccessibilityControllerBindings> bindings = gin::CreateHandle(
+      isolate, new AccessibilityControllerBindings(controller));
   if (bindings.IsEmpty())
     return;
   v8::Local<v8::Object> global = context->Global();
@@ -75,17 +74,15 @@ void AccessibilityControllerBindings::Install(
 
 AccessibilityControllerBindings::AccessibilityControllerBindings(
     base::WeakPtr<AccessibilityController> controller)
-  : controller_(controller) {
-}
+    : controller_(controller) {}
 
-AccessibilityControllerBindings::~AccessibilityControllerBindings() {
-}
+AccessibilityControllerBindings::~AccessibilityControllerBindings() {}
 
 gin::ObjectTemplateBuilder
 AccessibilityControllerBindings::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
-  return gin::Wrappable<AccessibilityControllerBindings>::
-      GetObjectTemplateBuilder(isolate)
+  return gin::Wrappable<
+             AccessibilityControllerBindings>::GetObjectTemplateBuilder(isolate)
       .SetMethod("logAccessibilityEvents",
                  &AccessibilityControllerBindings::LogAccessibilityEvents)
       .SetMethod("setNotificationListener",
@@ -94,8 +91,7 @@ AccessibilityControllerBindings::GetObjectTemplateBuilder(
                  &AccessibilityControllerBindings::UnsetNotificationListener)
       .SetProperty("focusedElement",
                    &AccessibilityControllerBindings::FocusedElement)
-      .SetProperty("rootElement",
-                   &AccessibilityControllerBindings::RootElement)
+      .SetProperty("rootElement", &AccessibilityControllerBindings::RootElement)
       .SetMethod("accessibleElementById",
                  &AccessibilityControllerBindings::AccessibleElementById)
       // TODO(hajimehoshi): These are for backward compatibility. Remove them.
@@ -161,7 +157,8 @@ bool AccessibilityController::ShouldLogAccessibilityEvents() {
 }
 
 void AccessibilityController::NotificationReceived(
-    const blink::WebAXObject& target, const std::string& notification_name) {
+    const blink::WebAXObject& target,
+    const std::string& notification_name) {
   v8::Isolate* isolate = blink::mainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
 
@@ -190,16 +187,13 @@ void AccessibilityController::NotificationReceived(
 
   // Call global notification listeners.
   v8::Local<v8::Value> argv[] = {
-    element_handle,
-    v8::String::NewFromUtf8(isolate, notification_name.data(),
-                            v8::String::kNormalString,
-                            notification_name.size()),
+      element_handle, v8::String::NewFromUtf8(isolate, notification_name.data(),
+                                              v8::String::kNormalString,
+                                              notification_name.size()),
   };
   frame->callFunctionEvenIfScriptDisabled(
       v8::Local<v8::Function>::New(isolate, notification_callback_),
-      context->Global(),
-      arraysize(argv),
-      argv);
+      context->Global(), arraysize(argv), argv);
 }
 
 void AccessibilityController::LogAccessibilityEvents() {
@@ -233,8 +227,8 @@ v8::Local<v8::Object> AccessibilityController::RootElement() {
   return elements_.GetOrCreate(root_element);
 }
 
-v8::Local<v8::Object>
-AccessibilityController::AccessibleElementById(const std::string& id) {
+v8::Local<v8::Object> AccessibilityController::AccessibleElementById(
+    const std::string& id) {
   blink::WebAXObject root_element = web_view()->accessibilityObject();
 
   if (!root_element.updateLayoutAndCheckValidity())
@@ -246,7 +240,8 @@ AccessibilityController::AccessibleElementById(const std::string& id) {
 
 v8::Local<v8::Object>
 AccessibilityController::FindAccessibleElementByIdRecursive(
-    const blink::WebAXObject& obj, const blink::WebString& id) {
+    const blink::WebAXObject& obj,
+    const blink::WebString& id) {
   if (obj.isNull() || obj.isDetached())
     return v8::Local<v8::Object>();