[Android WebAPK] Fix First Run showing twice for Maps Go
This CL fixes a bug introduced by
http://crrev.com/95ad83cedf394b9b37a8b3ab151116918b8f64ec where the
first run experience would show twice for Maps Go -> the lightweight
FRE launched by WebappLauncherActivity and the full FRE launched by
AsyncInitializationActivity. This CL is a partial revert of the CL.
This CL is simple so that it can be potentially merged back. The
"proper" fix is at
https://chromium-review.googlesource.com/c/chromium/src/+/1478460
BUG=932505
TEST=FirstRunIntegrationUnitTest.testUserAcceptedLightweightFreLaunch
Change-Id: Ic42adfe40eeaf03349ff838d52ee1e99c59f866e
Reviewed-on: https://chromium-review.googlesource.com/c/1476321
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#634895}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 95a23eca14803c1cacae7cc1dd6748d5bb2d3f9c
diff --git a/checkstyle/chromium-style-5.0.xml b/checkstyle/chromium-style-5.0.xml
index cd32e9d..563cfce 100644
--- a/checkstyle/chromium-style-5.0.xml
+++ b/checkstyle/chromium-style-5.0.xml
@@ -73,6 +73,7 @@
<message key="name.invalidPattern" value="Static field names start with s."/>
</module>
<module name="MethodName">
+ <property name="id" value="MethodNameCheck"/>
<property name="severity" value="error"/>
<property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
<message key="name.invalidPattern" value="Method names should start with a lower case letter (e.g. getWidth())"/>
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 3ff06d9..1a85a50 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -8,4 +8,6 @@
<suppress id="AlertDialogCheck"
files="src/(android_webview|base|build|chromecast|components|content|device|media|mojo|net|printing|services|testing|third_party|tools|ui|url)/"/>
<suppress id="StringBufferCheck" files="src/chrome/android/webapk/"/>
+ <!-- Robolectric shadows can overwrite constructor by implementing __constructor__() method. -->
+ <suppress id="MethodNameCheck" files="FirstRunIntegrationUnitTest.java"/>
</suppressions>