[Refactor]: Change WebappActivity#mWebappInfo -> #getWebappInfo()

This CL:
- Makes WebappActivity#mWebappInfo private
- Makes WebappActivity#getWebappInfo() public instead of package private

BUG=None

Change-Id: I3cec990487e8f6f01ecb4f832d9ae6269859c20a
Reviewed-on: https://chromium-review.googlesource.com/843817Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#527073}

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

@@ -65,7 +65,7 @@ public class WebApkActivity extends WebappActivity {
     @Override
     protected void initializeUI(Bundle savedInstance) {
         super.initializeUI(savedInstance);
-        getActivityTab().setWebappManifestScope(mWebappInfo.scopeUri().toString());
+        getActivityTab().setWebappManifestScope(getWebappInfo().scopeUri().toString());
     }
 
     @Override
@@ -120,7 +120,7 @@ public class WebApkActivity extends WebappActivity {
     protected void onDeferredStartupWithStorage(WebappDataStorage storage) {
         super.onDeferredStartupWithStorage(storage);
 
-        WebApkInfo info = (WebApkInfo) mWebappInfo;
+        WebApkInfo info = (WebApkInfo) getWebappInfo();
         WebApkUma.recordShellApkVersion(info.shellApkVersion(), info.apkPackageName());
 
         mUpdateManager = new WebApkUpdateManager(storage);

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkDisclosureNotificationManager.java

@@ -52,7 +52,7 @@ public class WebApkDisclosureNotificationManager {
         if (activityState == ActivityState.STARTED || activityState == ActivityState.RESUMED
                 || activityState == ActivityState.PAUSED) {
             sVisibleNotifications.add(packageName);
-            WebApkDisclosureNotificationManager.showDisclosure(activity.mWebappInfo);
+            WebApkDisclosureNotificationManager.showDisclosure(activity.getWebappInfo());
         }
     }
 

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActionsNotificationManager.java

@@ -52,7 +52,7 @@ class WebappActionsNotificationManager {
         if (!isEnabled() || mWebappActivity.getActivityTab() == null) return;
 
         // All features provided by the notification are also available in the minimal-ui toolbar.
-        if (mWebappActivity.mWebappInfo.displayMode() == WebDisplayMode.MINIMAL_UI) {
+        if (mWebappActivity.getWebappInfo().displayMode() == WebDisplayMode.MINIMAL_UI) {
             return;
         }
 
@@ -82,7 +82,7 @@ class WebappActionsNotificationManager {
                 .createChromeNotificationBuilder(
                         true /* prefer compat */, ChannelDefinitions.CHANNEL_ID_WEBAPP_ACTIONS)
                 .setSmallIcon(R.drawable.ic_chrome)
-                .setContentTitle(mWebappActivity.mWebappInfo.shortName())
+                .setContentTitle(mWebappActivity.getWebappInfo().shortName())
                 .setContentText(mWebappActivity.getString(R.string.webapp_tap_to_copy_url))
                 .setShowWhen(false)
                 .setAutoCancel(false)

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

@@ -104,7 +104,7 @@ public class WebappActivity extends SingleTabActivity {
     private final WebappActionsNotificationManager mNotificationManager;
     private final WebappDirectoryManager mDirectoryManager;
 
-    protected WebappInfo mWebappInfo;
+    private WebappInfo mWebappInfo;
 
     private WebappSplashScreenController mSplashController;
 
@@ -560,7 +560,7 @@ public class WebappActivity extends SingleTabActivity {
      * @return Structure containing data about the webapp currently displayed.
      *         The return value should not be cached.
      */
-    WebappInfo getWebappInfo() {
+    public WebappInfo getWebappInfo() {
         return mWebappInfo;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappBrowserControlsDelegate.java

@@ -67,11 +67,11 @@ class WebappBrowserControlsDelegate extends TabStateBrowserControlsVisibilityDel
      */
     static boolean shouldShowToolbarCloseButton(WebappActivity activity) {
         // Show if we're on the URL requiring browser controls, i.e. off-scope.
-        return shouldShowBrowserControlsForUrl(activity.scopePolicy(), activity.mWebappInfo,
+        return shouldShowBrowserControlsForUrl(activity.scopePolicy(), activity.getWebappInfo(),
                        activity.getActivityTab().getUrl())
                 // Also keep shown if toolbar is not visible, so that during the in and off-scope
                 // transitions we avoid button flickering when toolbar is appearing/disappearing.
-                || !shouldShowBrowserControls(activity.scopePolicy(), activity.mWebappInfo,
+                || !shouldShowBrowserControls(activity.scopePolicy(), activity.getWebappInfo(),
                            activity.getActivityTab().getUrl(),
                            activity.getActivityTab().getSecurityLevel(),
                            activity.getBrowserSession() != null && activity.didVerificationFail());

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInterceptNavigationDelegate.java

@@ -90,9 +90,9 @@ public class WebappInterceptNavigationDelegate extends InterceptNavigationDelega
                     navigationParams, mActivity.getWebappInfo(), mActivity.scopePolicy())) {
             CustomTabsIntent.Builder intentBuilder = new CustomTabsIntent.Builder();
             intentBuilder.setShowTitle(true);
-            if (mActivity.mWebappInfo.hasValidThemeColor()) {
+            if (mActivity.getWebappInfo().hasValidThemeColor()) {
                 // Need to cast as themeColor is a long to contain possible error results.
-                intentBuilder.setToolbarColor((int) mActivity.mWebappInfo.themeColor());
+                intentBuilder.setToolbarColor((int) mActivity.getWebappInfo().themeColor());
             }
             CustomTabsIntent customTabIntent = intentBuilder.build();
             customTabIntent.intent.setPackage(mActivity.getPackageName());
@@ -101,7 +101,7 @@ public class WebappInterceptNavigationDelegate extends InterceptNavigationDelega
             customTabIntent.intent.putExtra(CustomTabIntentDataProvider.EXTRA_BROWSER_LAUNCH_SOURCE,
                     mActivity.getActivityType());
             customTabIntent.intent.putExtra(
-                    Browser.EXTRA_APPLICATION_ID, mActivity.mWebappInfo.apkPackageName());
+                    Browser.EXTRA_APPLICATION_ID, mActivity.getWebappInfo().apkPackageName());
 
             if (shouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent()) {
                 customTabIntent.intent.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappLauncherActivity.java

@@ -192,7 +192,7 @@ public class WebappLauncherActivity extends Activity {
                     continue;
                 }
                 WebappActivity webappActivity = (WebappActivity) activity;
-                if (!TextUtils.equals(webappActivity.mWebappInfo.id(), info.id())) {
+                if (!TextUtils.equals(webappActivity.getWebappInfo().id(), info.id())) {
                     activity.finish();
                 }
                 break;