[Chromecast] Upload all crashes to main crash server

Previously Chromecast used to upload crash reports from debug/eng
builds to crash-staging/ server. But according to crash-users@ the
staging server was only meant for internal testing, we shouldn't be
using it. Instead we should upload all our crashes to the main crash/
server. Chrome and ChromeOS already upload all their crashes, from all
channels including dev and canary, to the main server. And this CL will
make Chromecast to always use the main server as well.

Bug: 112111490
Change-Id: Ic94ba1ba7d52d7188bb2fcfb6149cb734715b7d4
Reviewed-on: https://chromium-review.googlesource.com/1161004
Commit-Queue: Sergey Volk <servolk@chromium.org>
Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586052}

chromecast/app/android/crash_handler.cc

@@ -28,19 +28,6 @@ namespace {
 
 chromecast::CrashHandler* g_crash_handler = NULL;
 
-// Debug builds: always to crash-staging
-// Release builds: only to crash-staging for local/invalid build numbers
-bool UploadCrashToStaging() {
-#if CAST_IS_DEBUG_BUILD()
-  return true;
-#else
-  int build_number;
-  if (base::StringToInt(CAST_BUILD_INCREMENTAL, &build_number))
-    return build_number == 0;
-  return true;
-#endif
-}
-
 }  // namespace
 
 namespace chromecast {
@@ -97,17 +84,19 @@ void CrashHandler::UploadDumps(const base::FilePath& crash_dump_path,
       base::android::ConvertUTF8ToJavaString(env, uuid);
   base::android::ScopedJavaLocalRef<jstring> application_feedback_java =
       base::android::ConvertUTF8ToJavaString(env, application_feedback);
+  // TODO(servolk): Remove the UploadToStaging param and clean up Java code, if
+  // dev crash uploading to prod server works fine (b/113130776)
   bool can_send_usage_stats =
       android::ChromecastConfigAndroid::GetInstance()->CanSendUsageStats();
 
   if (can_send_usage_stats) {
     Java_CastCrashHandler_uploadOnce(env, crash_dump_path_java, uuid_java,
                                      application_feedback_java,
-                                     UploadCrashToStaging());
+                                     /* UploadToStaging = */ false);
   } else {
     Java_CastCrashHandler_removeCrashDumps(env, crash_dump_path_java, uuid_java,
                                            application_feedback_java,
-                                           UploadCrashToStaging());
+                                           /* UploadToStaging = */ false);
   }
 }
 

chromecast/crash/linux/minidump_uploader.cc

@@ -38,8 +38,6 @@ namespace {
 
 const char kProductName[] = "Eureka";
 
-const char kCrashServerStaging[] =
-    "https://clients2.google.com/cr/staging_report";
 const char kCrashServerProduction[] = "https://clients2.google.com/cr/report";
 
 const char kVirtualChannel[] = "virtual-channel";
@@ -80,11 +78,8 @@ MinidumpUploader::MinidumpUploader(CastSysInfo* sys_info,
       board_revision_(sys_info->GetBoardRevision()),
       manufacturer_(sys_info->GetManufacturer()),
       system_version_(sys_info->GetSystemBuildNumber()),
-      upload_location_(!server_url.empty()
-                           ? server_url
-                           : (sys_info->GetBuildType() == CastSysInfo::BUILD_ENG
-                                  ? kCrashServerStaging
-                                  : kCrashServerProduction)),
+      upload_location_(!server_url.empty() ? server_url
+                                           : kCrashServerProduction),
       last_upload_ratelimited_(true),
       reboot_scheduled_(false),
       filestate_initialized_(false),