diff options
17 files changed, 15 insertions, 53 deletions
diff --git a/base/android/java/src/org/chromium/base/Log.java b/base/android/java/src/org/chromium/base/Log.java index 38c49fc..3b46cdc 100644 --- a/base/android/java/src/org/chromium/base/Log.java +++ b/base/android/java/src/org/chromium/base/Log.java @@ -4,8 +4,6 @@ package org.chromium.base; -import android.text.TextUtils; - import org.chromium.base.annotations.RemovableInRelease; import java.util.Locale; @@ -62,27 +60,6 @@ public class Log { return "[" + getCallOrigin() + "] " + formatLog(messageTemplate, params); } - /** - * Returns a full tag for the provided group tag. Full tags longer than 23 characters - * will cause a runtime exception. - * - * @param groupTag {@code null} and empty string are allowed. - * - * @see android.util.Log#isLoggable(String, int) - * @throws IllegalArgumentException if the tag is too long. - * @deprecated Directly use a string (e.g. "cr.Tag") in your class. See http://crbug.com/485772 - */ - @Deprecated - public static String makeTag(String groupTag) { - if (TextUtils.isEmpty(groupTag)) return "cr"; - String tag = "cr." + groupTag; - if (tag.length() > 23) { - throw new IllegalArgumentException( - "The full tag (" + tag + ") is longer than 23 characters."); - } - return tag; - } - /** Convenience function, forwards to {@link android.util.Log#isLoggable(String, int)}. */ public static boolean isLoggable(String tag, int level) { return android.util.Log.isLoggable(tag, level); diff --git a/base/android/junit/src/org/chromium/base/LogTest.java b/base/android/junit/src/org/chromium/base/LogTest.java index ac98001..e5ce239 100644 --- a/base/android/junit/src/org/chromium/base/LogTest.java +++ b/base/android/junit/src/org/chromium/base/LogTest.java @@ -23,20 +23,6 @@ import java.util.List; @RunWith(LocalRobolectricTestRunner.class) @Config(manifest = Config.NONE, shadows = {LogTest.PermissiveShadowLog.class}) public class LogTest { - /** Test method for {@link Log#makeTag(String)} */ - @Test - public void testMakeTag() { - assertEquals("cr.Foo", Log.makeTag("Foo")); - assertEquals("cr", Log.makeTag(null)); - assertEquals("cr", Log.makeTag("")); - } - - /** Test method for {@link Log#makeTag(String)} */ - @Test(expected = IllegalArgumentException.class) - public void testMakeTagFailure() { - Log.makeTag("ThisIs21Char.....Long"); - } - /** Tests that the computed call origin is the correct one. */ @Test public void callOriginTest() { diff --git a/base/test/android/java/src/org/chromium/base/TestUiThread.java b/base/test/android/java/src/org/chromium/base/TestUiThread.java index 77f9660..4abec80 100644 --- a/base/test/android/java/src/org/chromium/base/TestUiThread.java +++ b/base/test/android/java/src/org/chromium/base/TestUiThread.java @@ -19,7 +19,7 @@ import javax.annotation.concurrent.ThreadSafe; @ThreadSafe public class TestUiThread { private static final AtomicBoolean sStarted = new AtomicBoolean(false); - private static final String TAG = Log.makeTag("TestUiThread"); + private static final String TAG = "cr.TestUiThread"; @CalledByNative private static void loop() { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java index 0efe58b..8efe97e7 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java @@ -42,7 +42,7 @@ import java.util.Locale; * Handles all browser-related Intents. */ public class IntentHandler { - private static final String TAG = Log.makeTag("IntentHandler"); + private static final String TAG = "cr.IntentHandler"; /** * Document mode: If true, Chrome is launched into the same Task. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java index a7fa5c9..7dc8121 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicReference; public class ExternalAuthUtils { public static final int FLAG_SHOULD_BE_GOOGLE_SIGNED = 1 << 0; public static final int FLAG_SHOULD_BE_SYSTEM = 1 << 1; - private static final String TAG = Log.makeTag("ExternalAuthUtils"); + private static final String TAG = "cr.ExternalAuthUtils"; private static final String CONNECTION_RESULT_HISTOGRAM_NAME = "GooglePlayServices.ConnectionResult"; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java index 0cb9949..c3a1f12 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/historyreport/HistoryReportJniBridge.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ @JNINamespace("history_report") public class HistoryReportJniBridge implements SearchJniBridge { - private static final String TAG = Log.makeTag("historyreport"); + private static final String TAG = "cr.historyreport"; private long mNativeHistoryReportJniBridge; private DataChangeObserver mDataChangeObserver; diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java index e5d6668..3453774 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/DelayedInvalidationsController.java @@ -30,7 +30,7 @@ import java.util.Set; * delayed until Chrome comes to the foreground again. */ public class DelayedInvalidationsController { - private static final String TAG = Log.makeTag("invalidation"); + private static final String TAG = "cr.invalidation"; private static final String DELAYED_ACCOUNT_NAME = "delayed_account"; private static final String DELAYED_INVALIDATIONS = "delayed_invalidations"; diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java index a960cb0..ada0123 100644 --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java @@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * Implementation of the ICustomTabsConnectionService interface. */ class CustomTabsConnection extends ICustomTabsConnectionService.Stub { - private static final String TAG = Log.makeTag("ChromeConnection"); + private static final String TAG = "cr.ChromeConnection"; private static final long RESULT_OK = 0; private static final long RESULT_ERROR = -1; private static final String KEY_CUSTOM_TABS_REFERRER = "android.support.CUSTOM_TABS:referrer"; diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java index 05a05dd..1f63c2e 100644 --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ChromeGoogleApiClientImpl.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; * Default implementation for {@link ChromeGoogleApiClient}. */ public class ChromeGoogleApiClientImpl implements ChromeGoogleApiClient { - private static final String TAG = Log.makeTag("Icing"); + private static final String TAG = "cr.Icing"; private final Context mApplicationContext; private final GoogleApiClient mClient; diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ConnectedTask.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ConnectedTask.java index 0c19fa5..1d87ad5 100644 --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ConnectedTask.java +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/gcore/ConnectedTask.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; * @param <T> type of {@link ChromeGoogleApiClient} to use for the tasks */ public abstract class ConnectedTask<T extends ChromeGoogleApiClient> implements Runnable { - private static final String TAG = Log.makeTag("GCore"); + private static final String TAG = "cr.GCore"; public static final long CONNECTION_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(5); public static final long CONNECTION_RETRY_TIME_MS = TimeUnit.SECONDS.toMillis(10); diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/gsa/ContextReporter.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/gsa/ContextReporter.java index 0ddc801..b88fd43 100644 --- a/chrome/android/java_staging/src/org/chromium/chrome/browser/gsa/ContextReporter.java +++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/gsa/ContextReporter.java @@ -30,7 +30,7 @@ import javax.annotation.Nullable; * Reports context to GSA for search quality. */ public class ContextReporter { - private static final String TAG = Log.makeTag("GSA"); + private static final String TAG = "cr.GSA"; // Values for UMA histogram. public static final int STATUS_SUCCESS = 0; diff --git a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashUploader.java b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashUploader.java index decce75..d56aafc 100644 --- a/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashUploader.java +++ b/chromecast/browser/android/apk/src/org/chromium/chromecast/shell/CastCrashUploader.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; * explicitly blocks any post-dump hooks or uploading for Android builds. */ public final class CastCrashUploader { - private static final String TAG = Log.makeTag("CastCrashUploader"); + private static final String TAG = "cr.CastCrashUploader"; private static final String CRASH_REPORT_HOST = "clients2.google.com"; private static final String CAST_SHELL_USER_AGENT = android.os.Build.MODEL + "/CastShell"; // Multipart dump filename has format "[random string].dmp[pid]", e.g. diff --git a/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java b/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java index b7f21b1..a7b3ebd 100644 --- a/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java +++ b/components/cronet/android/test/src/org/chromium/net/QuicTestServer.java @@ -17,7 +17,7 @@ import org.chromium.base.Log; @JNINamespace("cronet") public final class QuicTestServer { private static final ConditionVariable sBlock = new ConditionVariable(); - private static final String TAG = Log.makeTag("QuicTestServer"); + private static final String TAG = "cr.QuicTestServer"; public static void startQuicTestServer(Context context) { TestFilesInstaller.installIfNeeded(context); diff --git a/components/invalidation/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java b/components/invalidation/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java index 10f1293..89950f2 100644 --- a/components/invalidation/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java +++ b/components/invalidation/android/java/src/org/chromium/components/invalidation/PendingInvalidation.java @@ -24,7 +24,7 @@ import javax.annotation.Nullable; * (storing in prefStore) and Bundle (ContentProvider). */ public class PendingInvalidation { - private static final String TAG = Log.makeTag("invalidation"); + private static final String TAG = "cr.invalidation"; private static final String INVALIDATION_OBJECT_SOURCE_KEY = "objectSource"; private static final String INVALIDATION_OBJECT_ID_KEY = "objectId"; diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java index aaadab1..049110b 100644 --- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java +++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java @@ -6,7 +6,6 @@ package org.chromium.content_browsertests_apk; import android.os.Bundle; -import org.chromium.base.Log; import org.chromium.base.PathUtils; import org.chromium.content_shell.browsertests.ContentShellBrowserTestActivity; @@ -16,7 +15,7 @@ import java.io.File; * Android activity for running content browser tests */ public class ContentBrowserTestsActivity extends ContentShellBrowserTestActivity { - private static final String TAG = Log.makeTag("native_test"); + private static final String TAG = "cr.native_test"; @Override public void onCreate(Bundle savedInstanceState) { diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java index 3c8b265..d7fbca0 100644 --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/BluetoothAdapter.java @@ -19,7 +19,7 @@ import org.chromium.base.Log; */ @JNINamespace("device") final class BluetoothAdapter { - private static final String TAG = Log.makeTag("Bluetooth"); + private static final String TAG = "cr.Bluetooth"; private final boolean mHasBluetoothPermission; private android.bluetooth.BluetoothAdapter mAdapter; diff --git a/net/test/android/javatests/src/org/chromium/net/test/BaseTestServer.java b/net/test/android/javatests/src/org/chromium/net/test/BaseTestServer.java index c54de3d..049306b 100644 --- a/net/test/android/javatests/src/org/chromium/net/test/BaseTestServer.java +++ b/net/test/android/javatests/src/org/chromium/net/test/BaseTestServer.java @@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** A base class for simple test servers. */ public abstract class BaseTestServer implements Runnable { - private static final String TAG = Log.makeTag("net.test"); + private static final String TAG = "cr.net.test"; private AtomicBoolean mKeepRunning; private final Object mLock; |