| Index: content/shell/test_runner/test_runner_for_specific_view.cc
 | 
| diff --git a/components/test_runner/test_runner_for_specific_view.cc b/content/shell/test_runner/test_runner_for_specific_view.cc
 | 
| similarity index 94%
 | 
| rename from components/test_runner/test_runner_for_specific_view.cc
 | 
| rename to content/shell/test_runner/test_runner_for_specific_view.cc
 | 
| index 026a715908e58ab286b7085a9c0b31f2d40e0864..b5b4685c87191ea9f8996d9caa4c36d317c8760f 100644
 | 
| --- a/components/test_runner/test_runner_for_specific_view.cc
 | 
| +++ b/content/shell/test_runner/test_runner_for_specific_view.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_runner_for_specific_view.h"
 | 
| +#include "content/shell/test_runner/test_runner_for_specific_view.h"
 | 
|  
 | 
|  #include <stddef.h>
 | 
|  #include <limits>
 | 
| @@ -14,21 +14,21 @@
 | 
|  #include "base/strings/string_number_conversions.h"
 | 
|  #include "base/strings/stringprintf.h"
 | 
|  #include "build/build_config.h"
 | 
| -#include "components/test_runner/layout_and_paint_async_then.h"
 | 
| -#include "components/test_runner/layout_dump.h"
 | 
| -#include "components/test_runner/mock_content_settings_client.h"
 | 
| -#include "components/test_runner/mock_credential_manager_client.h"
 | 
| -#include "components/test_runner/mock_screen_orientation_client.h"
 | 
| -#include "components/test_runner/mock_web_speech_recognizer.h"
 | 
| -#include "components/test_runner/mock_web_user_media_client.h"
 | 
| -#include "components/test_runner/pixel_dump.h"
 | 
| -#include "components/test_runner/spell_check_client.h"
 | 
| -#include "components/test_runner/test_common.h"
 | 
| -#include "components/test_runner/test_interfaces.h"
 | 
| -#include "components/test_runner/test_preferences.h"
 | 
| -#include "components/test_runner/test_runner.h"
 | 
| -#include "components/test_runner/web_test_delegate.h"
 | 
| -#include "components/test_runner/web_view_test_proxy.h"
 | 
| +#include "content/shell/test_runner/layout_and_paint_async_then.h"
 | 
| +#include "content/shell/test_runner/layout_dump.h"
 | 
| +#include "content/shell/test_runner/mock_content_settings_client.h"
 | 
| +#include "content/shell/test_runner/mock_credential_manager_client.h"
 | 
| +#include "content/shell/test_runner/mock_screen_orientation_client.h"
 | 
| +#include "content/shell/test_runner/mock_web_speech_recognizer.h"
 | 
| +#include "content/shell/test_runner/mock_web_user_media_client.h"
 | 
| +#include "content/shell/test_runner/pixel_dump.h"
 | 
| +#include "content/shell/test_runner/spell_check_client.h"
 | 
| +#include "content/shell/test_runner/test_common.h"
 | 
| +#include "content/shell/test_runner/test_interfaces.h"
 | 
| +#include "content/shell/test_runner/test_preferences.h"
 | 
| +#include "content/shell/test_runner/test_runner.h"
 | 
| +#include "content/shell/test_runner/web_test_delegate.h"
 | 
| +#include "content/shell/test_runner/web_view_test_proxy.h"
 | 
|  #include "gin/arguments.h"
 | 
|  #include "gin/array_buffer.h"
 | 
|  #include "gin/handle.h"
 | 
| @@ -99,8 +99,8 @@ void TestRunnerForSpecificView::Reset() {
 | 
|  #if !defined(OS_MACOSX) && !defined(OS_WIN)
 | 
|      // (Constants copied because we can't depend on the header that defined
 | 
|      // them from this file.)
 | 
| -    web_view()->setSelectionColors(
 | 
| -        0xff1e90ff, 0xff000000, 0xffc8c8c8, 0xff323232);
 | 
| +    web_view()->setSelectionColors(0xff1e90ff, 0xff000000, 0xffc8c8c8,
 | 
| +                                   0xff323232);
 | 
|  #endif
 | 
|      web_view()->setVisibilityState(WebPageVisibilityStateVisible, true);
 | 
|      if (web_view()->mainFrame()->isWebLocalFrame()) {
 | 
| @@ -272,10 +272,7 @@ void TestRunnerForSpecificView::CapturePixelsCallback(
 | 
|    const size_t bufferRowBytes = bufferInfo.minRowBytes();
 | 
|    blink::WebArrayBuffer buffer =
 | 
|        blink::WebArrayBuffer::create(bufferInfo.getSafeSize(bufferRowBytes), 1);
 | 
| -  if (!snapshot.readPixels(bufferInfo,
 | 
| -                           buffer.data(),
 | 
| -                           bufferRowBytes,
 | 
| -                           0, 0)) {
 | 
| +  if (!snapshot.readPixels(bufferInfo, buffer.data(), bufferRowBytes, 0, 0)) {
 | 
|      // We only expect readPixels to fail for null bitmaps.
 | 
|      DCHECK(snapshot.isNull());
 | 
|    }
 | 
| @@ -464,8 +461,8 @@ bool TestRunnerForSpecificView::HasCustomPageSizeStyle(int page_index) {
 | 
|  }
 | 
|  
 | 
|  void TestRunnerForSpecificView::ForceRedSelectionColors() {
 | 
| -  web_view()->setSelectionColors(
 | 
| -      0xffee0000, 0xff00ee00, 0xff000000, 0xffc0c0c0);
 | 
| +  web_view()->setSelectionColors(0xffee0000, 0xff00ee00, 0xff000000,
 | 
| +                                 0xffc0c0c0);
 | 
|  }
 | 
|  
 | 
|  void TestRunnerForSpecificView::SetPageVisibility(
 | 
| 
 |