Content Shell: Move shell_layout_tests_android into layout_tests/.

content/shell/browser/layout_test/layout_test_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/shell/browser/shell_layout_tests_android.h"
+#include "content/shell/browser/layout_test/layout_test_android.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/test/nested_message_pump_android.h"
 #include "content/shell/common/shell_switches.h"
 #include "jni/ShellLayoutTestUtils_jni.h"
@@ skipping 34 matching lines @@
     return false;
 
   std::string test_location(kAndroidLayoutTestBase);
   test_location.append(path_or_url.substr(strlen(kAndroidLayoutTestPath)));
 
   *url = GURL(test_location);
   return true;
 }
 
 void EnsureInitializeForAndroidLayoutTests() {
-  CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree));
-
   JNIEnv* env = base::android::AttachCurrentThread();
   content::NestedMessagePumpAndroid::RegisterJni(env);
   content::RegisterNativesImpl(env);
 
   bool success = base::MessageLoop::InitMessagePumpForUIFactory(
       &CreateMessagePumpForUI);
   CHECK(success) << "Unable to initialize the message pump for Android.";
 
   // Android will need three FIFOs to communicate with the Blink test runner,
   // one for each of [stdout, stderr, stdin].
@@ skipping 12 matching lines @@
   // Redirecting stdout needs to happen before redirecting stdin, which needs
   // to happen before redirecting stderr.
   success = base::android::RedirectStream(stdout, stdout_fifo, "w") &&
             base::android::RedirectStream(stdin, stdin_fifo, "r") &&
             base::android::RedirectStream(stderr, stderr_fifo, "w");
 
   CHECK(success) << "Unable to initialize the Android FIFOs.";
 }
 
 }  // namespace content