Upgrade process: Add an error message for when CoCreateInstance fails.

chrome/browser/google/google_update.cc

Index: chrome/browser/google/google_update.cc
===================================================================
--- chrome/browser/google/google_update.cc	(revision 140271)
+++ chrome/browser/google/google_update.cc	(working copy)
@@ -270,7 +270,8 @@
   if (hr != S_OK) {
     // Most of the error messages come straight from Google Update. This one is
     // deemed worthy enough to also warrant its own error.
-    string16 error_code = base::StringPrintf(L"0x%x", hr);
+    string16 error_code = base::StringPrintf(
+        L"%d: 0x%x", GOOGLE_UPDATE_JOB_SERVER_CREATION_FAILED, hr);
     ReportFailure(
         hr, GOOGLE_UPDATE_JOB_SERVER_CREATION_FAILED,
         l10n_util::GetStringFUTF16(IDS_ABOUT_BOX_ERROR_COCREATE_FAILED,
@@ -307,8 +308,15 @@
   }
 
   if (hr != S_OK) {
+    string16 error_code = base::StringPrintf(
+        L"%d: 0x%x", GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, hr);

[S. Ganesh, 2012/06/07 21:23:02]

Since the value is repeated and needs to be in sync, perhaps have a variable
that is assigned GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, and use it in the 2
occurences. Same for other cases where ReportFailure is called in this file.

+    if (system_level)
+      error_code += L" -- system level";
     ReportFailure(hr, GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND,
-                  string16(), main_loop);
+                  l10n_util::GetStringFUTF16(
+                      IDS_ABOUT_BOX_ERROR_COCREATE_FAILED,
+                      error_code),
+                  main_loop);
     return;
   }
 
@@ -321,8 +329,13 @@
     hr = on_demand->Update(app_guid.c_str(), job_observer);
 
   if (hr != S_OK) {
+    string16 error_code = base::StringPrintf(
+        L"%d: 0x%x", GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR, hr);
     ReportFailure(hr, GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR,
-                  string16(), main_loop);
+                  l10n_util::GetStringFUTF16(
+                      IDS_ABOUT_BOX_ERROR_COCREATE_FAILED,

[S. Ganesh, 2012/06/07 21:23:02]

Technically this is not a CoCreate failure. I presume the error message is
generic enough that it does not confuse the user?

+                      error_code),
+                  main_loop);
     return;
   }
 
@@ -334,9 +347,15 @@
 
   GoogleUpdateUpgradeResult results;
   hr = job_observer->GetResult(&results);
+
   if (hr != S_OK) {
+    string16 error_code = base::StringPrintf(
+        L"%d: 0x%x", GOOGLE_UPDATE_GET_RESULT_CALL_FAILED, hr);
     ReportFailure(hr, GOOGLE_UPDATE_GET_RESULT_CALL_FAILED,
-                  string16(), main_loop);
+                  l10n_util::GetStringFUTF16(
+                      IDS_ABOUT_BOX_ERROR_COCREATE_FAILED,

[S. Ganesh, 2012/06/07 21:23:02]

Technically this is not a CoCreate failure. I presume the error message is
generic enough that it does not confuse the user?

+                      error_code),
+                  main_loop);
     return;
   }
 
@@ -349,8 +368,13 @@
 
   hr = job_observer->GetVersionInfo(&version_available_);
   if (hr != S_OK) {
+    string16 error_code = base::StringPrintf(
+        L"%d: 0x%x", GOOGLE_UPDATE_GET_VERSION_INFO_FAILED, hr);
     ReportFailure(hr, GOOGLE_UPDATE_GET_VERSION_INFO_FAILED,
-                  string16(), main_loop);
+                  l10n_util::GetStringFUTF16(
+                      IDS_ABOUT_BOX_ERROR_COCREATE_FAILED,

[S. Ganesh, 2012/06/07 21:23:02]

Technically this is not a CoCreate failure. I presume the error message is
generic enough that it does not confuse the user?

[Finnur, 2012/06/08 13:52:36]

The variable name is a bit misleading but the error message is generic. I've
changed the varible name to be more generic.

On 2012/06/07 21:23:02, ganesh wrote:

+                      error_code),
+                  main_loop);
     return;
   }