Upstream: Launch WebApkActivity from WebAPK.

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java

 // Copyright 2015 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.chrome.browser.webapps;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ skipping 60 matching lines @@
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setPackage(getInstrumentation().getTargetContext().getPackageName());
         intent.setAction(WebappLauncherActivity.ACTION_START_WEBAPP);
         if (addMac) {
             // Needed for security reasons.  If the MAC is excluded, the URL of the webapp is opened
             // in a browser window, instead.
             String mac = ShortcutHelper.getEncodedMac(getInstrumentation().getTargetContext(), url);
             intent.putExtra(ShortcutHelper.EXTRA_MAC, mac);
         }
 
-        WebappInfo webappInfo = WebappInfo.create(id, url, icon, title, null,
+        WebappInfo webappInfo = WebappInfo.create(id, url, icon, null, title, null,
                 ScreenOrientationValues.PORTRAIT, ShortcutSource.UNKNOWN,
                 ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING,
-                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false);
+                ShortcutHelper.MANIFEST_COLOR_INVALID_OR_MISSING, false, null);
         webappInfo.setWebappIntentExtras(intent);
 
         return intent;
     }
 
     private void fireWebappIntent(String id, String url, String title, String icon,
             boolean addMac) throws Exception {
         Intent intent = createIntent(id, url, title, icon, addMac);
 
         getInstrumentation().getTargetContext().startActivity(intent);
@@ skipping 277 matching lines @@
 
         WebappActivity webappActivity = (WebappActivity) lastActivity;
         if (webappActivity.getActivityTab() == null) return false;
 
         View rootView = webappActivity.findViewById(android.R.id.content);
         if (!rootView.hasWindowFocus()) return false;
 
         return true;
     }
 }