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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small fixes and findbugs line update Created 6 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: content/public/android/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java b/content/public/android/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
deleted file mode 100644
index 81d6d285522bdf8275302a2a4204a3362c2e2778..0000000000000000000000000000000000000000
--- a/content/public/android/javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.
-
-package org.chromium.content.browser;
-
-import static org.chromium.base.test.util.ScalableTimeout.ScaleTimeout;
-
-import android.os.SystemClock;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.Feature;
-import org.chromium.content_shell_apk.ContentShellActivity;
-import org.chromium.content_shell_apk.ContentShellTestBase;
-
-import java.io.File;
-
-public class TracingControllerAndroidTest extends ContentShellTestBase {
-
- private static final long TIMEOUT_MILLIS = ScaleTimeout(30 * 1000);
-
- @MediumTest
- @Feature({"GPU"})
- public void testTraceFileCreation() throws Exception {
- ContentShellActivity activity = launchContentShellWithUrl("about:blank");
- waitForActiveShellToBeDoneLoading();
-
- final TracingControllerAndroid tracingController = new TracingControllerAndroid(activity);
- assertFalse(tracingController.isTracing());
- assertNull(tracingController.getOutputPath());
-
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- assertTrue(tracingController.startTracing(true, "*", false));
- }
- });
-
- assertTrue(tracingController.isTracing());
- File file = new File(tracingController.getOutputPath());
- assertTrue(file.getName().startsWith("chrome-profile-results"));
-
- ThreadUtils.runOnUiThreadBlocking(new Runnable() {
- @Override
- public void run() {
- tracingController.stopTracing();
- }
- });
-
- // The tracer stops asynchronously, because it needs to wait for native code to flush and
- // close the output file. Give it a little time.
- long startTime = SystemClock.uptimeMillis();
- while (tracingController.isTracing()) {
- if (SystemClock.uptimeMillis() > startTime + TIMEOUT_MILLIS) {
- fail("Timed out waiting for tracing to stop.");
- }
- Thread.sleep(1000);
- }
-
- // It says it stopped, so it should have written the output file.
- assertTrue(file.exists());
- assertTrue(file.delete());
- }
-}

Powered by Google App Engine
This is Rietveld 408576698