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

chrome/browser/google/google_update.cc

 // Copyright (c) 2012 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/google/google_update.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "base/bind.h"
@@ skipping 252 matching lines @@
                    UPGRADE_ERROR, error_code, string16()));
     return;
   }
 
   CComObject<GoogleUpdateJobObserver>* job_observer;
   HRESULT hr =
       CComObject<GoogleUpdateJobObserver>::CreateInstance(&job_observer);
   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,
             error_code),
         main_loop);
     return;
   }
 
   base::win::ScopedComPtr<IJobObserver> job_holder(job_observer);
 
@@ skipping 16 matching lines @@
       }
 
       hr = CoCreateInstanceAsAdmin(CLSID_OnDemandMachineAppsClass,
           IID_IGoogleUpdate, foreground_hwnd,
           reinterpret_cast<void**>(on_demand.Receive()));
     }
     system_level = true;
   }
 
   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;
   }
 
   string16 app_guid = installer::GetAppGuidForUpdates(system_level);
   DCHECK(!app_guid.empty());
 
   if (!install_if_newer)
     hr = on_demand->CheckForUpdate(app_guid.c_str(), job_observer);
   else
     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;
   }
 
   // We need to spin the message loop while Google Update is running so that it
   // can report back to us through GoogleUpdateJobObserver. This message loop
   // will terminate once Google Update sends us the completion status
   // (success/error). See OnComplete().
   MessageLoop::current()->Run();
 
   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;
   }
 
   if (results == UPGRADE_ERROR) {
     string16 error_message;
     job_observer->GetErrorMessage(&error_message);
     ReportFailure(hr, GOOGLE_UPDATE_ERROR_UPDATING, error_message, main_loop);
     return;
   }
 
   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;
   }
 
   main_loop->PostTask(
       FROM_HERE,
       base::Bind(&GoogleUpdate::ReportResults, this,
                  results, GOOGLE_UPDATE_NO_ERROR, string16()));
   job_holder = NULL;
   on_demand = NULL;
 }
@@ skipping 16 matching lines @@
                                  MessageLoop* main_loop) {
   NOTREACHED() << "Communication with Google Update failed: " << hr
                << " error: " << error_code
                << ", message: " << error_message.c_str();
   main_loop->PostTask(
       FROM_HERE,
       base::Bind(&GoogleUpdate::ReportResults, this,
                  UPGRADE_ERROR, error_code, error_message));
   return false;
 }