Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Unified Diff: base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java

Issue 1647803004: Move base to DEPS (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java b/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
deleted file mode 100644
index 797585f4593ab1ace985dd2e840f502fafd39f55..0000000000000000000000000000000000000000
--- a/base/test/android/javatests/src/org/chromium/base/test/util/UrlUtils.java
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2012 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.
-
-package org.chromium.base.test.util;
-
-import junit.framework.Assert;
-
-import org.chromium.base.PathUtils;
-
-/**
- * Collection of URL utilities.
- */
-public class UrlUtils {
- private static final String DATA_DIR = "/chrome/test/data/";
-
- /**
- * Construct the full path of a test data file.
- * @param path Pathname relative to external/chrome/test/data
- */
- public static String getTestFilePath(String path) {
- // TODO(jbudorick): Remove DATA_DIR once everything has been isolated. crbug/400499
- return PathUtils.getExternalStorageDirectory() + DATA_DIR + path;
- }
-
- // TODO(jbudorick): Remove this function once everything has been isolated and switched back
- // to getTestFilePath. crbug/400499
- /**
- * Construct the full path of a test data file.
- * @param path Pathname relative to external/
- */
- public static String getIsolatedTestFilePath(String path) {
- return PathUtils.getExternalStorageDirectory() + "/" + path;
- }
-
- /**
- * Construct a suitable URL for loading a test data file.
- * @param path Pathname relative to external/chrome/test/data
- */
- public static String getTestFileUrl(String path) {
- return "file://" + getTestFilePath(path);
- }
-
- // TODO(jbudorick): Remove this function once everything has been isolated and switched back
- // to getTestFileUrl. crbug/400499
- /**
- * Construct a suitable URL for loading a test data file.
- * @param path Pathname relative to external/
- */
- public static String getIsolatedTestFileUrl(String path) {
- return "file://" + getIsolatedTestFilePath(path);
- }
-
- /**
- * Construct a data:text/html URI for loading from an inline HTML.
- * @param html An unencoded HTML
- * @return String An URI that contains the given HTML
- */
- public static String encodeHtmlDataUri(String html) {
- try {
- // URLEncoder encodes into application/x-www-form-encoded, so
- // ' '->'+' needs to be undone and replaced with ' '->'%20'
- // to match the Data URI requirements.
- String encoded =
- "data:text/html;utf-8," + java.net.URLEncoder.encode(html, "UTF-8");
- encoded = encoded.replace("+", "%20");
- return encoded;
- } catch (java.io.UnsupportedEncodingException e) {
- Assert.fail("Unsupported encoding: " + e.getMessage());
- return null;
- }
- }
-}

Powered by Google App Engine
This is Rietveld 408576698