Make GetCommandExecuteImplClsid return the CLSID as a string directly.

win8/delegate_execute/delegate_execute.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 <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
 #include <initguid.h>
 #include <shellapi.h>
 
@@ skipping 28 matching lines @@
  public :
   typedef ATL::CAtlExeModuleT<DelegateExecuteModule> ParentClass;
   typedef CComObject<CommandExecuteImpl> ImplType;
 
   DelegateExecuteModule()
       : registration_token_(0) {
   }
 
   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))
       return hr;
 
     // We use the same class creation logic as ATL itself.  See
     // _ATL_OBJMAP_ENTRY::RegisterClassObject() in atlbase.h
     hr = ImplType::_ClassFactoryCreatorClass::CreateInstance(
         ImplType::_CreatorClass::CreateInstance, IID_IUnknown,
         instance_.ReceiveVoid());
@@ skipping 130 matching lines @@
       case DelegateExecuteOperation::RELAUNCH_CHROME:
         ret_code = RelaunchChrome(operation);
         break;
       default:
         NOTREACHED();
     }
   }
   AtlTrace("delegate_execute exit, code = %d\n", ret_code);
   return ret_code;
 }