[Merge to M58] [Android Crash Reporting] Simplify crash report upload code.

chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionCallableTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionCallableTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionCallableTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionCallableTest.java
deleted file mode 100644
index 9de518819a9722d7405b4d9f6e58205adb8c3dc3..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/crash/LogcatExtractionCallableTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2015 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.chrome.browser.crash;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.filters.MediumTest;
-
-import org.chromium.base.test.util.AdvancedMockContext;
-import org.chromium.components.minidump_uploader.CrashFileManager;
-import org.chromium.components.minidump_uploader.CrashTestCase;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Unittests for {@link LogcatExtractionCallable}.
- */
-public class LogcatExtractionCallableTest extends CrashTestCase {
-    private File mCrashDir;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCrashDir = new CrashFileManager(mCacheDir).getCrashDirectory();
-    }
-
-    @MediumTest
-    public void testExtractToFile() {
-        final AtomicInteger numServiceStarts = new AtomicInteger(0);
-        final String logContent = "some random log content";
-        final Intent testIntent = new Intent();
-        File dmp1 = new File(mCrashDir, "test1.dmp");
-        File dmp2 = new File(mCrashDir, "test2.dmp");
-        File dmp3 = new File(mCrashDir, "test3.dmp");
-        final String[] dumps = new String[] {dmp1.getName(), dmp2.getName(), dmp3.getName()};
-
-        Context testContext = new AdvancedMockContext(getInstrumentation().getTargetContext()) {
-            @Override
-            public ComponentName startService(Intent intentToCheck) {
-                assertTrue("We should have no more than 3 intents created",
-                        numServiceStarts.incrementAndGet() <= dumps.length);
-                Intent redirectIntent = intentToCheck.getParcelableExtra("redirect_intent");
-
-                // Only the very last one will have a non-null redirect_intent.
-                if (numServiceStarts.get() == dumps.length) {
-                    // And it should be == to the one we pass into the constructor.
-                    assertSame(redirectIntent, testIntent);
-                } else {
-                    assertNull(redirectIntent);
-                }
-                return new ComponentName(
-                        getPackageName(), LogcatExtractionCallable.class.getName());
-            }
-        };
-
-        LogcatExtractionCallable callable =
-                new LogcatExtractionCallable(testContext, dumps, testIntent) {
-                    @Override
-                    protected List<String> getLogcat() throws IOException, InterruptedException {
-                        List<String> result = new ArrayList<String>();
-                        result.add(logContent);
-                        return result;
-                    }
-                };
-
-        callable.call();
-
-        assertFileContent("test1.logcat", logContent);
-        assertFileContent("test2.logcat", logContent);
-        assertFileContent("test3.logcat", logContent);
-    }
-
-    private void assertFileContent(String fileName, String content) {
-        try {
-            File logfile = new File(mCrashDir, fileName);
-            assertTrue("Logfile does not exist!", logfile.exists());
-            BufferedReader input = new BufferedReader(new FileReader(logfile));
-            StringBuilder sb = new StringBuilder();
-            String line = null;
-            while ((line = input.readLine()) != null) {
-                sb.append(line);
-            }
-            input.close();
-            assertEquals("Content not matched!", content, sb.toString());
-        } catch (Exception e) {
-            fail(e.toString());
-        }
-    }
-}