Update from https://crrev.com/311076

testing/android/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java

 // Copyright 2014 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.native_test;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  *  An Instrumentation that runs tests based on ChromeNativeTestActivity.
  */
-public class ChromiumNativeTestInstrumentationTestRunner extends Instrumentation {
+public class ChromeNativeTestInstrumentationTestRunner extends Instrumentation {
 
-    private static final String TAG = "ChromiumNativeTestInstrumentationTestRunner";
+    private static final String TAG = "ChromeNativeTestInstrumentationTestRunner";
     private static final Pattern RE_TEST_OUTPUT = Pattern.compile("\\[ *([^ ]*) *\\] ?([^ ]*) .*");
 
     private static interface ResultsBundleGenerator {
         public Bundle generate(Map<String, TestResult> rawResults);
     }
 
     private String mCommandLineFile;
     private String mCommandLineFlags;
     private Bundle mLogBundle;
     private ResultsBundleGenerator mBundleGenerator;
@@ skipping 142 matching lines @@
                         "\nFAILURES!!! Tests run: " + Integer.toString(rawResults.size())
                         + ", Failures: " + Integer.toString(testsFailed) + ", Errors: 0");
             }
             resultsBundle.putString(Instrumentation.REPORT_KEY_STREAMRESULT,
                     resultBuilder.toString());
             return resultsBundle;
         }
     }
 
 }