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

content/shell/test_runner/test_plugin.cc

Index: content/shell/test_runner/test_plugin.cc
diff --git a/components/test_runner/test_plugin.cc b/content/shell/test_runner/test_plugin.cc
similarity index 96%
rename from components/test_runner/test_plugin.cc
rename to content/shell/test_runner/test_plugin.cc
index 54b7046ea03f80fe150005f245b677ca2092ebcd..601f65f607e4ef32c6b296ef5f0a1fd5a9584249 100644
--- a/components/test_runner/test_plugin.cc
+++ b/content/shell/test_runner/test_plugin.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/test_plugin.h"
+#include "content/shell/test_runner/test_plugin.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -17,7 +17,7 @@
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/shared_bitmap_manager.h"
-#include "components/test_runner/web_test_delegate.h"
+#include "content/shell/test_runner/web_test_delegate.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebCompositorSupport.h"
@@ -72,10 +72,9 @@ void PrintTouchList(WebTestDelegate* delegate,
                     const blink::WebTouchPoint* points,
                     int length) {
   for (int i = 0; i < length; ++i) {
-    delegate->PrintMessage(base::StringPrintf("* %.2f, %.2f: %s\n",
-                                              points[i].position.x,
-                                              points[i].position.y,
-                                              PointState(points[i].state)));
+    delegate->PrintMessage(
+        base::StringPrintf("* %.2f, %.2f: %s\n", points[i].position.x,
+                           points[i].position.y, PointState(points[i].state)));
   }
 }
 
@@ -161,8 +160,7 @@ TestPlugin::TestPlugin(blink::WebFrame* frame,
         std::string("TestPlugin: canCreateWithoutRenderer\n"));
 }
 
-TestPlugin::~TestPlugin() {
-}
+TestPlugin::~TestPlugin() {}
 
 bool TestPlugin::initialize(blink::WebPluginContainer* container) {
   DCHECK(container);
@@ -317,8 +315,8 @@ bool TestPlugin::PrepareTextureMailbox(
 TestPlugin::Primitive TestPlugin::ParsePrimitive(
     const blink::WebString& string) {
   const CR_DEFINE_STATIC_LOCAL(blink::WebString, kPrimitiveNone, ("none"));
-  const CR_DEFINE_STATIC_LOCAL(
-      blink::WebString, kPrimitiveTriangle, ("triangle"));
+  const CR_DEFINE_STATIC_LOCAL(blink::WebString, kPrimitiveTriangle,
+                               ("triangle"));
 
   Primitive primitive = PrimitiveNone;
   if (string == kPrimitiveNone)
@@ -498,7 +496,7 @@ GLuint TestPlugin::LoadShader(GLenum type, const std::string& source) {
   GLuint shader = gl_->CreateShader(type);
   if (shader) {
     const GLchar* shader_data = source.data();
-    GLint shader_length = strlen(shader_data); //source.length();
+    GLint shader_length = strlen(shader_data);  // source.length();
     gl_->ShaderSource(shader, 1, &shader_data, &shader_length);
     gl_->CompileShader(shader);
 
@@ -593,23 +591,21 @@ TestPlugin* TestPlugin::create(blink::WebFrame* frame,
 }
 
 const blink::WebString& TestPlugin::MimeType() {
-  const CR_DEFINE_STATIC_LOCAL(
-      blink::WebString, kMimeType, ("application/x-webkit-test-webplugin"));
+  const CR_DEFINE_STATIC_LOCAL(blink::WebString, kMimeType,
+                               ("application/x-webkit-test-webplugin"));
   return kMimeType;
 }
 
 const blink::WebString& TestPlugin::CanCreateWithoutRendererMimeType() {
   const CR_DEFINE_STATIC_LOCAL(
-      blink::WebString,
-      kCanCreateWithoutRendererMimeType,
+      blink::WebString, kCanCreateWithoutRendererMimeType,
       ("application/x-webkit-test-webplugin-can-create-without-renderer"));
   return kCanCreateWithoutRendererMimeType;
 }
 
 const blink::WebString& TestPlugin::PluginPersistsMimeType() {
   const CR_DEFINE_STATIC_LOCAL(
-      blink::WebString,
-      kPluginPersistsMimeType,
+      blink::WebString, kPluginPersistsMimeType,
       ("application/x-webkit-test-webplugin-persistent"));
   return kPluginPersistsMimeType;
 }