[Cronet] Fix up log TAGs to be accurate and prevent future inaccuracies.

As Cronet classes have been getting renamed we've failed to keep our
log TAGs accurate.  This change makes them accurate and attempts to
prevent future inaccuracies by using class.getSimpleName() in hopes
that a class rename will force a TAG rename.

R=xunjieli
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2109293005
Cr-Commit-Position: refs/heads/master@{#443274}

components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java

@@ -72,7 +72,7 @@ public class CronetEngineBuilderImpl extends ICronetEngineBuilder {
         }
     }
 
-    private static final String TAG = "CronetEngineBuilder";
+    private static final String TAG = CronetEngineBuilderImpl.class.getSimpleName();
     private static final String NATIVE_CRONET_IMPL_CLASS =
             "org.chromium.net.impl.CronetUrlRequestContext";
     private static final String JAVA_CRONET_IMPL_CLASS = "org.chromium.net.impl.JavaCronetEngine";

components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java

@@ -23,7 +23,7 @@ public class CronetLibraryLoader {
     // Synchronize initialization.
     private static final Object sLoadLock = new Object();
     private static final String LIBRARY_NAME = "cronet";
-    private static final String TAG = "CronetLibraryLoader";
+    private static final String TAG = CronetLibraryLoader.class.getSimpleName();
     // Has library loading commenced?  Setting guarded by sLoadLock.
     private static volatile boolean sInitStarted = false;
     // Has ensureMainThreadInitialized() completed?  Only accessed on main thread.

components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java

@@ -5,8 +5,8 @@
 package org.chromium.net.impl;
 
 import android.annotation.SuppressLint;
-import android.util.Log;
 
+import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
@@ -33,7 +33,7 @@ import javax.annotation.concurrent.GuardedBy;
 @JNINamespace("cronet")
 @VisibleForTesting
 public final class CronetUploadDataStream extends UploadDataSink {
-    private static final String TAG = "CronetUploadDataStream";
+    private static final String TAG = CronetUploadDataStream.class.getSimpleName();
     // These are never changed, once a request starts.
     private final Executor mExecutor;
     private final VersionSafeCallbacks.UploadDataProviderWrapper mDataProvider;

components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java

@@ -8,8 +8,8 @@ import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
-import android.util.Log;
 
+import org.chromium.base.Log;
 import org.chromium.base.ObserverList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
@@ -52,7 +52,7 @@ public class CronetUrlRequestContext extends CronetEngineBase {
     private static final int LOG_NONE = 3; // LOG(FATAL), no VLOG.
     private static final int LOG_DEBUG = -1; // LOG(FATAL...INFO), VLOG(1)
     private static final int LOG_VERBOSE = -2; // LOG(FATAL...INFO), VLOG(2)
-    static final String LOG_TAG = "ChromiumNetwork";
+    static final String LOG_TAG = CronetUrlRequestContext.class.getSimpleName();
 
     /**
      * Synchronize access to mUrlRequestContextAdapter and shutdown routine.

components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java

@@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicReference;
 final class JavaUrlRequest extends UrlRequestBase {
     private static final String X_ANDROID = "X-Android";
     private static final String X_ANDROID_SELECTED_TRANSPORT = "X-Android-Selected-Transport";
-    private static final String TAG = "JavaUrlConnection";
+    private static final String TAG = JavaUrlRequest.class.getSimpleName();
     private static final int DEFAULT_UPLOAD_BUFFER_SIZE = 8192;
     private static final int DEFAULT_CHUNK_LENGTH = DEFAULT_UPLOAD_BUFFER_SIZE;
     private static final String USER_AGENT = "User-Agent";

components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java

@@ -21,7 +21,7 @@ import java.util.concurrent.Executor;
  */
 public class UrlRequestBuilderImpl extends ExperimentalUrlRequest.Builder {
     private static final String ACCEPT_ENCODING = "Accept-Encoding";
-    private static final String TAG = "UrlRequestBuilder";
+    private static final String TAG = UrlRequestBuilderImpl.class.getSimpleName();
 
     // All fields are temporary storage of ExperimentalUrlRequest configuration to be
     // copied to built ExperimentalUrlRequest.

components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java

@@ -34,7 +34,7 @@ import java.util.TreeMap;
  * {@hide}
  */
 public class CronetHttpURLConnection extends HttpURLConnection {
-    private static final String TAG = "cr_CronetHttpURLConn";
+    private static final String TAG = CronetHttpURLConnection.class.getSimpleName();
     private static final String CONTENT_LENGTH = "Content-Length";
     private final CronetEngine mCronetEngine;
     private final MessageLoop mMessageLoop;

components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java

@@ -8,12 +8,12 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import org.chromium.base.Log;
 import org.chromium.net.CronetEngine;
 import org.chromium.net.CronetException;
 import org.chromium.net.UploadDataProviders;
@@ -32,7 +32,7 @@ import java.util.concurrent.Executors;
  * Activity for managing the Cronet Sample.
  */
 public class CronetSampleActivity extends Activity {
-    private static final String TAG = "CronetSample";
+    private static final String TAG = CronetSampleActivity.class.getSimpleName();
 
     private CronetEngine mCronetEngine;
 
@@ -54,7 +54,7 @@ public class CronetSampleActivity extends Activity {
         @Override
         public void onResponseStarted(UrlRequest request, UrlResponseInfo info) {
             Log.i(TAG, "****** Response Started ******");
-            Log.i(TAG, "*** Headers Are *** %s", info.getAllHeaders());
+            Log.i(TAG, "*** Headers Are *** " + info.getAllHeaders());
 
             request.read(ByteBuffer.allocateDirect(32 * 1024));
         }
@@ -63,7 +63,7 @@ public class CronetSampleActivity extends Activity {
         public void onReadCompleted(
                 UrlRequest request, UrlResponseInfo info, ByteBuffer byteBuffer) {
             byteBuffer.flip();
-            Log.i(TAG, "****** onReadCompleted ******%s", byteBuffer);
+            Log.i(TAG, "****** onReadCompleted ******" + byteBuffer);
 
             try {
                 mReceiveChannel.write(byteBuffer);
@@ -76,8 +76,8 @@ public class CronetSampleActivity extends Activity {
 
         @Override
         public void onSucceeded(UrlRequest request, UrlResponseInfo info) {
-            Log.i(TAG, "****** Request Completed, status code is %d, total received bytes is %d",
-                    info.getHttpStatusCode(), info.getReceivedByteCount());
+            Log.i(TAG, "****** Request Completed, status code is " + info.getHttpStatusCode()
+                            + ", total received bytes is " + info.getReceivedByteCount());
 
             final String receivedData = mBytesReceived.toString();
             final String url = info.getUrl();
@@ -93,7 +93,7 @@ public class CronetSampleActivity extends Activity {
 
         @Override
         public void onFailed(UrlRequest request, UrlResponseInfo info, CronetException error) {
-            Log.i(TAG, "****** onFailed, error is: %s", error.getMessage());
+            Log.i(TAG, "****** onFailed, error is: " + error.getMessage());
 
             final String url = mUrl;
             final String text = "Failed " + mUrl + " (" + error.getMessage() + ")";
@@ -164,7 +164,7 @@ public class CronetSampleActivity extends Activity {
     }
 
     private void startWithURL(String url, String postData) {
-        Log.i(TAG, "Cronet started: %s", url);
+        Log.i(TAG, "Cronet started: " + url);
         mUrl = url;
 
         Executor executor = Executors.newSingleThreadExecutor();

components/cronet/android/test/javatests/src/org/chromium/net/ExperimentalOptionsTest.java

@@ -19,7 +19,7 @@ import java.io.FileReader;
  * Tests for experimental options.
  */
 public class ExperimentalOptionsTest extends CronetTestBase {
-    private static final String TAG = "cr.QuicTest";
+    private static final String TAG = ExperimentalOptionsTest.class.getSimpleName();
     private CronetTestFramework mTestFramework;
     private ExperimentalCronetEngine.Builder mBuilder;
 

components/cronet/android/test/javatests/src/org/chromium/net/QuicTest.java

@@ -27,7 +27,7 @@ import java.util.concurrent.Executors;
  * Tests making requests using QUIC.
  */
 public class QuicTest extends CronetTestBase {
-    private static final String TAG = "cr.QuicTest";
+    private static final String TAG = QuicTest.class.getSimpleName();
     private static final String QUIC_PROTOCOL_STRING_PREFIX = "http/2+quic/";
     private CronetTestFramework mTestFramework;
     private ExperimentalCronetEngine.Builder mBuilder;

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java

@@ -16,7 +16,7 @@ import org.chromium.net.ExperimentalCronetEngine;
  * Provides support for tests that depend on QUIC and HTTP2 servers.
  */
 class ChromiumNativeTestSupport extends ChromiumPlatformOnlyTestSupport {
-    private static final String TAG = "NativeTestSupport";
+    private static final String TAG = ChromiumNativeTestSupport.class.getSimpleName();
 
     @Override
     public TestServer createTestServer(Context context, Protocol protocol) {

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/HttpTestServer.java

@@ -34,7 +34,7 @@ import io.netty.util.CharsetUtil;
  * A simple HTTP server for testing.
  */
 public class HttpTestServer implements TestSupport.TestServer {
-    private static final String TAG = "HttpTestServer";
+    private static final String TAG = HttpTestServer.class.getSimpleName();
     private static final String HOST = "127.0.0.1";
     private static final int PORT = 8080;
 

components/cronet/android/test/src/org/chromium/net/CronetTestFramework.java

@@ -23,7 +23,7 @@ import java.net.URLStreamHandlerFactory;
  */
 @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
 public class CronetTestFramework {
-    private static final String TAG = "CronetTestFramework";
+    private static final String TAG = CronetTestFramework.class.getSimpleName();
 
     public static final String COMMAND_LINE_ARGS_KEY = "commandLineArgs";
     public static final String POST_DATA_KEY = "postData";

components/cronet/android/test/src/org/chromium/net/Http2TestHandler.java

@@ -42,7 +42,7 @@ public final class Http2TestHandler extends Http2ConnectionHandler implements Ht
     public static final String ECHO_STREAM_PATH = "/echostream";
     public static final String ECHO_TRAILERS_PATH = "/echotrailers";
 
-    private static final String TAG = "cr_Http2TestHandler";
+    private static final String TAG = Http2TestHandler.class.getSimpleName();
     private static final Http2FrameLogger sLogger =
             new Http2FrameLogger(INFO, Http2TestHandler.class);
     private static final ByteBuf RESPONSE_BYTES =

components/cronet/android/test/src/org/chromium/net/Http2TestServer.java

@@ -40,7 +40,7 @@ import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 public final class Http2TestServer {
     private static final ConditionVariable sBlock = new ConditionVariable();
     private static Channel sServerChannel;
-    private static final String TAG = "Http2TestServer";
+    private static final String TAG = Http2TestServer.class.getSimpleName();
 
     private static final String HOST = "127.0.0.1";
     // Server port.

components/cronet/android/test/src/org/chromium/net/QuicTestServer.java

@@ -19,7 +19,7 @@ import org.chromium.base.test.util.UrlUtils;
 @JNINamespace("cronet")
 public final class QuicTestServer {
     private static final ConditionVariable sBlock = new ConditionVariable();
-    private static final String TAG = "cr.QuicTestServer";
+    private static final String TAG = QuicTestServer.class.getSimpleName();
 
     private static final String CERT_USED = "quic_test.example.com.crt";
     private static final String KEY_USED = "quic_test.example.com.key";

components/cronet/android/test/src/org/chromium/net/TestFilesInstaller.java

@@ -19,7 +19,7 @@ import java.io.IOException;
  * Helper class to install test files.
  */
 public final class TestFilesInstaller {
-    private static final String TAG = "TestFilesInstaller";
+    private static final String TAG = TestFilesInstaller.class.getSimpleName();
     // Name of the asset directory in which test files are stored.
     private static final String TEST_FILE_ASSET_PATH = "test";