Make GetCommandExecuteImplClsid return the CLSID as a string directly.

BUG=Unjustified single out-param.

Review URL: https://codereview.chromium.org/1321143002

Cr-Commit-Position: refs/heads/master@{#346915}

chrome/installer/setup/install_worker.cc

@@ -1255,9 +1255,9 @@ void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
                                  const Version& new_version,
                                  const Product& product,
                                  WorkItemList* list) {
-  base::string16 handler_class_uuid;
   BrowserDistribution* dist = product.distribution();
-  if (!dist->GetCommandExecuteImplClsid(&handler_class_uuid)) {
+  const base::string16 handler_class_uuid = dist->GetCommandExecuteImplClsid();
+  if (handler_class_uuid.empty()) {
     if (InstallUtil::IsChromeSxSProcess()) {
       CleanupBadCanaryDelegateExecuteRegistration(target_path, list);
     } else {

chrome/installer/util/browser_distribution.cc

@@ -257,11 +257,8 @@ bool BrowserDistribution::GetChromeChannel(base::string16* channel) {
   return false;
 }
 
-bool BrowserDistribution::GetCommandExecuteImplClsid(
-    base::string16* handler_class_uuid) {
-  if (handler_class_uuid)
-    *handler_class_uuid = kCommandExecuteImplUuid;
-  return true;
+base::string16 BrowserDistribution::GetCommandExecuteImplClsid() {
+  return kCommandExecuteImplUuid;
 }
 
 void BrowserDistribution::UpdateInstallStatus(bool system_install,

chrome/installer/util/browser_distribution.h

@@ -140,10 +140,9 @@ class BrowserDistribution {
 
   virtual bool GetChromeChannel(base::string16* channel);
 
-  // Returns true if this distribution includes a DelegateExecute verb handler,
-  // and provides the CommandExecuteImpl class UUID if |handler_class_uuid| is
-  // non-NULL.
-  virtual bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid);
+  // Returns the CommandExecuteImpl class UUID (or empty string if this
+  // distribution doesn't include a DelegateExecute verb handler).
+  virtual base::string16 GetCommandExecuteImplClsid();
 
   virtual void UpdateInstallStatus(bool system_install,
       installer::ArchiveType archive_type,

chrome/installer/util/chrome_frame_distribution.cc

@@ -108,9 +108,8 @@ bool ChromeFrameDistribution::CanCreateDesktopShortcuts() {
   return false;
 }
 
-bool ChromeFrameDistribution::GetCommandExecuteImplClsid(
-    base::string16* handler_class_uuid) {
-  return false;
+base::string16 ChromeFrameDistribution::GetCommandExecuteImplClsid() {
+  return base::string16();
 }
 
 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,

chrome/installer/util/chrome_frame_distribution.h

@@ -43,7 +43,7 @@ class ChromeFrameDistribution : public BrowserDistribution {
 
   bool CanCreateDesktopShortcuts() override;
 
-  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
+  base::string16 GetCommandExecuteImplClsid() override;
 
   void UpdateInstallStatus(bool system_install,
                            installer::ArchiveType archive_type,

chrome/installer/util/chromium_binaries_distribution.cc

@@ -106,7 +106,6 @@ bool ChromiumBinariesDistribution::GetChromeChannel(base::string16* channel) {
   return false;
 }
 
-bool ChromiumBinariesDistribution::GetCommandExecuteImplClsid(
-    base::string16* handler_class_uuid) {
-  return false;
+base::string16 ChromiumBinariesDistribution::GetCommandExecuteImplClsid() {
+  return base::string16();
 }

chrome/installer/util/chromium_binaries_distribution.h

@@ -44,7 +44,7 @@ class ChromiumBinariesDistribution : public BrowserDistribution {
 
   bool GetChromeChannel(base::string16* channel) override;
 
-  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
+  base::string16 GetCommandExecuteImplClsid() override;
 
  protected:
   friend class BrowserDistribution;

chrome/installer/util/google_chrome_distribution.cc

@@ -236,11 +236,8 @@ base::string16 GoogleChromeDistribution::GetIconFilename() {
   return installer::kChromeExe;
 }
 
-bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
-    base::string16* handler_class_uuid) {
-  if (handler_class_uuid)
-    *handler_class_uuid = kCommandExecuteImplUuid;
-  return true;
+base::string16 GoogleChromeDistribution::GetCommandExecuteImplClsid() {
+  return kCommandExecuteImplUuid;
 }
 
 // This method checks if we need to change "ap" key in Google Update to try

chrome/installer/util/google_chrome_distribution.h

@@ -65,7 +65,7 @@ class GoogleChromeDistribution : public BrowserDistribution {
 
   base::string16 GetUninstallRegPath() override;
 
-  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
+  base::string16 GetCommandExecuteImplClsid() override;
 
   void UpdateInstallStatus(
       bool system_install,

chrome/installer/util/google_chrome_distribution_dummy.cc

@@ -93,9 +93,8 @@ base::string16 GoogleChromeDistribution::GetIconFilename() {
   return base::string16();
 }
 
-bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
-    base::string16* handler_class_uuid) {
-  return false;
+base::string16 GoogleChromeDistribution::GetCommandExecuteImplClsid() {
+  return base::string16();
 }
 
 void GoogleChromeDistribution::UpdateInstallStatus(bool system_install,

chrome/installer/util/google_chrome_sxs_distribution.cc

@@ -102,11 +102,8 @@ bool GoogleChromeSxSDistribution::GetChromeChannel(base::string16* channel) {
   return true;
 }
 
-bool GoogleChromeSxSDistribution::GetCommandExecuteImplClsid(
-    base::string16* handler_class_uuid) {
-  if (handler_class_uuid)
-    *handler_class_uuid = kCommandExecuteImplUuid;
-  return true;
+base::string16 GoogleChromeSxSDistribution::GetCommandExecuteImplClsid() {
+  return kCommandExecuteImplUuid;
 }
 
 bool GoogleChromeSxSDistribution::ShouldSetExperimentLabels() {

chrome/installer/util/google_chrome_sxs_distribution.h

@@ -31,7 +31,7 @@ class GoogleChromeSxSDistribution : public GoogleChromeDistribution {
   base::string16 GetUninstallRegPath() override;
   DefaultBrowserControlPolicy GetDefaultBrowserControlPolicy() override;
   bool GetChromeChannel(base::string16* channel) override;
-  bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid) override;
+  base::string16 GetCommandExecuteImplClsid() override;
   bool ShouldSetExperimentLabels() override;
   bool HasUserExperiments() override;
   // returns the channel name for GoogleChromeSxSDistribution

chrome/installer/util/shell_util.cc

@@ -336,7 +336,7 @@ class RegistryEntry {
     app_info.application_description = dist->GetAppDescription();
     app_info.publisher_name = dist->GetPublisherName();
 
-    dist->GetCommandExecuteImplClsid(&app_info.delegate_clsid);
+    app_info.delegate_clsid = dist->GetCommandExecuteImplClsid();
 
     GetProgIdEntries(app_info, entries);
 

win8/delegate_execute/delegate_execute.cc

@@ -46,10 +46,10 @@ class DelegateExecuteModule
 
   HRESULT PreMessageLoop(int nShowCmd) {
     HRESULT hr = S_OK;
-    base::string16 clsid_string;
     GUID clsid;
     BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    if (!dist->GetCommandExecuteImplClsid(&clsid_string))
+    const base::string16 clsid_string = dist->GetCommandExecuteImplClsid();
+    if (clsid_string.empty())
       return E_FAIL;
     hr = ::CLSIDFromString(clsid_string.c_str(), &clsid);
     if (FAILED(hr))