Merge M59 [WebAPKs] Fix WebAPK updates when Web Manifest does not specify color

chrome/browser/android/webapk/webapk_update_manager.cc

 // Copyright 2016 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/webapk/webapk_update_manager.h"
 
 #include <jni.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 65 matching lines @@
   GURL best_primary_icon_url(
       ConvertJavaStringToUTF8(env, java_best_primary_icon_url));
   ShortcutInfo info(start_url);
   info.scope = scope;
   info.name = ConvertJavaStringToUTF16(env, java_name);
   info.short_name = ConvertJavaStringToUTF16(env, java_short_name);
   info.user_title = info.short_name;
   info.display = static_cast<blink::WebDisplayMode>(java_display_mode);
   info.orientation =
       static_cast<blink::WebScreenOrientationLockType>(java_orientation);
-  info.theme_color = (long)java_theme_color;
-  info.background_color = (long)java_background_color;
+  info.theme_color = (int64_t)java_theme_color;
+  info.background_color = (int64_t)java_background_color;
   info.best_primary_icon_url = best_primary_icon_url;
   info.manifest_url = web_manifest_url;
 
   base::android::AppendJavaStringArrayToStringVector(env, java_icon_urls.obj(),
                                                      &info.icon_urls);
 
   std::vector<std::string> icon_hashes;
   base::android::AppendJavaStringArrayToStringVector(
       env, java_icon_hashes.obj(), &icon_hashes);
 
@@ skipping 16 matching lines @@
         base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id,
                    WebApkInstallResult::FAILURE, false /* relax_updates */,
                    "" /* webapk_package */));
     return;
   }
   install_service->UpdateAsync(
       info, best_primary_icon_bitmap, webapk_package, java_webapk_version,
       icon_url_to_murmur2_hash, java_is_manifest_stale,
       base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id));
 }