Rename CLSID_UpdaterControlServiceClass to CLSID_UpdaterControlClass

The *ServiceClass names are intended for per-machine coclass names.
This CLSID is used by the per-user code but it has been named
using the per-machine naming convention by mistake.

This is a step toward spplitting updater idls goal.

Bug: 1140562
Change-Id: I12b0d2f7d15d0f58de062e6e9f0dbec0eff5420e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493720Reviewed-by: S. Ganesh <ganesh@chromium.org>
Commit-Queue: Sorin Jianu <sorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820053}

chrome/updater/app/server/win/server.cc

@@ -112,7 +112,7 @@ HRESULT ComServerApp::RegisterClassObjects() {
       std::extent<decltype(cookies_)>() == base::size(class_factories),
       "Arrays cookies_ and class_factories must be the same size.");
 
-  IID class_ids[] = {__uuidof(UpdaterClass), CLSID_UpdaterControlServiceClass,
+  IID class_ids[] = {__uuidof(UpdaterClass), CLSID_UpdaterControlClass,
                      CLSID_GoogleUpdate3WebUserClass};
   DCHECK_EQ(base::size(cookies_), base::size(class_ids));
   static_assert(std::extent<decltype(cookies_)>() == base::size(class_ids),

chrome/updater/win/constants.cc

@@ -26,7 +26,7 @@ const CLSID CLSID_UpdaterServiceClass = {
     {0x93, 0xAC, 0x1B, 0xA6, 0xE5, 0xFD, 0x4E, 0x93}};
 
 // {1F87FE2F-D6A9-4711-9D11-8187705F8457}
-const CLSID CLSID_UpdaterControlServiceClass{
+const CLSID CLSID_UpdaterControlClass{
     0x1f87fe2f,
     0xd6a9,
     0x4711,

chrome/updater/win/constants.h

@@ -41,7 +41,7 @@ extern const base::char16 kWindowsServiceName[];
 // The 'dynamic_guid' feature of midl.gni only allows for a single 'coclass'
 // definition in the IDL file. Any other coclasses need to be defined here.
 extern const CLSID CLSID_UpdaterServiceClass;
-extern const CLSID CLSID_UpdaterControlServiceClass;
+extern const CLSID CLSID_UpdaterControlClass;
 extern const CLSID CLSID_GoogleUpdate3WebUserClass;
 
 }  // namespace updater

chrome/updater/win/control_service_proxy.cc

@@ -152,7 +152,7 @@ void ControlServiceProxy::RunOnSTA(base::OnceClosure callback) {
   DCHECK(com_task_runner_->BelongsToCurrentThread());
 
   Microsoft::WRL::ComPtr<IUnknown> server;
-  HRESULT hr = ::CoCreateInstance(CLSID_UpdaterControlServiceClass, nullptr,
+  HRESULT hr = ::CoCreateInstance(CLSID_UpdaterControlClass, nullptr,
                                   CLSCTX_LOCAL_SERVER, IID_PPV_ARGS(&server));
   if (FAILED(hr)) {
     DVLOG(2) << "Failed to instantiate the updater control server. " << std::hex
@@ -215,7 +215,7 @@ void ControlServiceProxy::InitializeUpdateServiceOnSTA(
   DCHECK(com_task_runner_->BelongsToCurrentThread());
 
   Microsoft::WRL::ComPtr<IUnknown> server;
-  HRESULT hr = ::CoCreateInstance(CLSID_UpdaterControlServiceClass, nullptr,
+  HRESULT hr = ::CoCreateInstance(CLSID_UpdaterControlClass, nullptr,
                                   CLSCTX_LOCAL_SERVER, IID_PPV_ARGS(&server));
   if (FAILED(hr)) {
     DVLOG(2) << "Failed to instantiate the updater control server. " << std::hex

chrome/updater/win/setup/setup.cc

@@ -48,9 +48,8 @@ void AddComServerWorkItems(HKEY root,
     return;
   }
 
-  for (const auto& clsid :
-       {__uuidof(UpdaterClass), CLSID_UpdaterControlServiceClass,
-        CLSID_GoogleUpdate3WebUserClass}) {
+  for (const auto& clsid : {__uuidof(UpdaterClass), CLSID_UpdaterControlClass,
+                            CLSID_GoogleUpdate3WebUserClass}) {
     const base::string16 clsid_reg_path = GetComServerClsidRegistryPath(clsid);
 
     // Delete any old registrations first.

chrome/updater/win/setup/uninstall.cc

@@ -32,9 +32,8 @@
 namespace updater {
 
 void DeleteComServer(HKEY root) {
-  for (const auto& clsid :
-       {__uuidof(UpdaterClass), CLSID_UpdaterControlServiceClass,
-        CLSID_GoogleUpdate3WebUserClass}) {
+  for (const auto& clsid : {__uuidof(UpdaterClass), CLSID_UpdaterControlClass,
+                            CLSID_GoogleUpdate3WebUserClass}) {
     InstallUtil::DeleteRegistryKey(root, GetComServerClsidRegistryPath(clsid),
                                    WorkItem::kWow64Default);
   }