Add an about:flag to control WebApk enablement.

chrome/browser/notifications/notification_platform_bridge_android.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/notifications/notification_platform_bridge_android.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/android/jni_array.h"
@@ skipping 166 matching lines @@
     const std::string& profile_id,
     bool incognito,
     const Notification& notification) {
   JNIEnv* env = AttachCurrentThread();
   // TODO(miguelg): Store the notification type in java instead of assuming it's
   // persistent once/if non persistent notifications are ever implemented on
   // Android.
   DCHECK_EQ(notification_type, NotificationCommon::PERSISTENT);
 
   GURL origin_url(notification.origin_url().GetOrigin());
-  ScopedJavaLocalRef<jstring> webapk_package;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableWebApk)) {
-    GURL scope_url(notification.service_worker_scope());
-    if (!scope_url.is_valid())
-      scope_url = origin_url;
-    ScopedJavaLocalRef<jstring> j_scope_url =
+
+  GURL scope_url(notification.service_worker_scope());
+  if (!scope_url.is_valid())
+    scope_url = origin_url;
+  ScopedJavaLocalRef<jstring> j_scope_url =
         ConvertUTF8ToJavaString(env, scope_url.spec());
-    webapk_package = Java_NotificationPlatformBridge_queryWebApkPackage(
-        env, java_object_.obj(), j_scope_url.obj());
-  } else {
-    webapk_package = ConvertUTF8ToJavaString(env, "");
-  }
+  ScopedJavaLocalRef<jstring> webapk_package =
+      Java_NotificationPlatformBridge_queryWebApkPackage(
+          env, java_object_.obj(), j_scope_url.obj());
 
   ScopedJavaLocalRef<jstring> j_notification_id =
       ConvertUTF8ToJavaString(env, notification_id);
   ScopedJavaLocalRef<jstring> j_origin =
       ConvertUTF8ToJavaString(env, origin_url.spec());
   ScopedJavaLocalRef<jstring> tag =
       ConvertUTF8ToJavaString(env, notification.tag());
   ScopedJavaLocalRef<jstring> title =
       ConvertUTF16ToJavaString(env, notification.title());
   ScopedJavaLocalRef<jstring> body =
@@ skipping 95 matching lines @@
     RegeneratedNotificationInfo() {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     RegeneratedNotificationInfo(const std::string& origin,
                                 const std::string& tag,
                                 const std::string& webapk_package)
     : origin(origin), tag(tag), webapk_package(webapk_package) {}
 
 NotificationPlatformBridgeAndroid::RegeneratedNotificationInfo::
     ~RegeneratedNotificationInfo() {}