| Index: content/shell/browser/layout_test/layout_test_android.cc
|
| diff --git a/content/shell/browser/layout_test/layout_test_android.cc b/content/shell/browser/layout_test/layout_test_android.cc
|
| index c981d84fb3ce3cd609cad00f71f50094cc6a58eb..f19d721c993e423a12eaf0194c05c9e83a824f0e 100644
|
| --- a/content/shell/browser/layout_test/layout_test_android.cc
|
| +++ b/content/shell/browser/layout_test/layout_test_android.cc
|
| @@ -17,13 +17,6 @@
|
|
|
| namespace {
|
|
|
| -// Path to search for when translating a layout test path to an URL.
|
| -const char kAndroidLayoutTestPath[] =
|
| - "/data/local/tmp/third_party/WebKit/LayoutTests/";
|
| -
|
| -// The base URL from which layout tests are being served on Android.
|
| -const char kAndroidLayoutTestBase[] = "http://127.0.0.1:8000/all-tests/";
|
| -
|
| base::FilePath GetTestFilesDirectory(JNIEnv* env) {
|
| ScopedJavaLocalRef<jstring> directory =
|
| content::Java_ShellLayoutTestUtils_getApplicationFilesDirectory(
|
| @@ -45,17 +38,6 @@ scoped_ptr<base::MessagePump> CreateMessagePumpForUI() {
|
|
|
| namespace content {
|
|
|
| -bool GetTestUrlForAndroid(std::string& path_or_url, GURL* url) {
|
| - if (path_or_url.find(kAndroidLayoutTestPath) == std::string::npos)
|
| - return false;
|
| -
|
| - std::string test_location(kAndroidLayoutTestBase);
|
| - test_location.append(path_or_url.substr(strlen(kAndroidLayoutTestPath)));
|
| -
|
| - *url = GURL(test_location);
|
| - return true;
|
| -}
|
| -
|
| void EnsureInitializeForAndroidLayoutTests() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| content::NestedMessagePumpAndroid::RegisterJni(env);
|
|
|