Fix WebApkInstallService::IsInstallInProgress() crash.

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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/android/shortcut_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 250 matching lines @@
         env, java_webapk_package_name);
   }
   return webapk_package_name;
 }
 
 // static
 bool ShortcutHelper::IsWebApkInstalled(
     content::BrowserContext* browser_context,
     const GURL& start_url,
     const GURL& manifest_url) {
-  return !QueryWebApkPackage(start_url).empty() ||
-      WebApkInstallService::Get(browser_context)
-      ->IsInstallInProgress(manifest_url);
+  if (!QueryWebApkPackage(start_url).empty())
+    return true;
+  if (!ChromeWebApkHost::AreWebApkEnabled())
+    return false;
+  WebApkInstallService* service = WebApkInstallService::Get(browser_context);
+  return service != nullptr && service->IsInstallInProgress(manifest_url);

[pkotwicz, 2017/01/12 15:37:42]

This is no longer necessary?

[Xi Han, 2017/01/12 15:50:36]

I am just not 100 presents sure whether it is necessary or not, since the
stacktrace of the incognito mode crash isn't exactly same as the crash report.
But we could give it a try by removing these checks.

 }
 
 GURL ShortcutHelper::GetScopeFromURL(const GURL& url) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
       Java_ShortcutHelper_getScopeFromUrl(env, java_url);
   return GURL(base::android::ConvertJavaStringToUTF16(env, java_scope_url));
 }
@@ skipping 11 matching lines @@
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }