Content Shell: Move shell_layout_tests_android into layout_tests/.

content/shell/browser/layout_test/layout_test_android.cc

Index: content/shell/browser/layout_test/layout_test_android.cc
diff --git a/content/shell/browser/shell_layout_tests_android.cc b/content/shell/browser/layout_test/layout_test_android.cc
similarity index 95%
rename from content/shell/browser/shell_layout_tests_android.cc
rename to content/shell/browser/layout_test/layout_test_android.cc
index 5047bb613c70759e57cfd8512844fe09663c214e..c981d84fb3ce3cd609cad00f71f50094cc6a58eb 100644
--- a/content/shell/browser/shell_layout_tests_android.cc
+++ b/content/shell/browser/layout_test/layout_test_android.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 "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"
@@ -57,8 +57,6 @@ bool GetTestUrlForAndroid(std::string& path_or_url, GURL* url) {
 }
 
 void EnsureInitializeForAndroidLayoutTests() {
-  CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree));
-
   JNIEnv* env = base::android::AttachCurrentThread();
   content::NestedMessagePumpAndroid::RegisterJni(env);
   content::RegisterNativesImpl(env);