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

content/shell/test_runner/mock_content_settings_client.cc

Index: content/shell/test_runner/mock_content_settings_client.cc
diff --git a/components/test_runner/mock_content_settings_client.cc b/content/shell/test_runner/mock_content_settings_client.cc
similarity index 86%
rename from components/test_runner/mock_content_settings_client.cc
rename to content/shell/test_runner/mock_content_settings_client.cc
index c9417d940a5504e1d6396f83afc912c0abf08486..03b3d90a4890574b5a7a0a11f9560926d48693e9 100644
--- a/components/test_runner/mock_content_settings_client.cc
+++ b/content/shell/test_runner/mock_content_settings_client.cc
@@ -2,11 +2,11 @@
 // 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_content_settings_client.h"
+#include "content/shell/test_runner/mock_content_settings_client.h"
 
-#include "components/test_runner/layout_test_runtime_flags.h"
-#include "components/test_runner/test_common.h"
-#include "components/test_runner/web_test_delegate.h"
+#include "content/shell/test_runner/layout_test_runtime_flags.h"
+#include "content/shell/test_runner/test_common.h"
+#include "content/shell/test_runner/web_test_delegate.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace test_runner {
@@ -23,8 +23,8 @@ bool MockContentSettingsClient::allowImage(bool enabled_per_settings,
   if (flags_->dump_web_content_settings_client_callbacks() && delegate_) {
     delegate_->PrintMessage(
         std::string("MockContentSettingsClient: allowImage(") +
-        NormalizeLayoutTestURL(image_url.string().utf8()) +
-        "): " + (allowed ? "true" : "false") + "\n");
+        NormalizeLayoutTestURL(image_url.string().utf8()) + "): " +
+        (allowed ? "true" : "false") + "\n");
   }
   return allowed;
 }