Use midl.py's new dynamic guid mechanism for all Updater COM Classes.

This CL uses the feature added in Issue 1109612 to change all Updater
COM Classes to have dynamic guids.

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

chrome/updater/app/server/win/BUILD.gn

@@ -6,10 +6,11 @@ import("//build/toolchain/win/midl.gni")
 import("//build/util/version.gni")
 import("//chrome/updater/branding.gni")
 
-# TODO(crbug.com/1109612): these GUIDs must depend on branding only.
-placeholder_guids = [
+# These GUIDs must depend on branding only.
+branding_only_placeholder_guids = [
   "PLACEHOLDER-GUID-69464FF0-D9EC-4037-A35F-8AE4358106CC",  # UpdaterLib
   "PLACEHOLDER-GUID-158428a4-6014-4978-83ba-9fad0dabe791",  # UpdaterClass
+  "PLACEHOLDER-GUID-415FD747-D79E-42D7-93AC-1BA6E5FD4E93",  # UpdaterServiceClass
   "PLACEHOLDER-GUID-63B8FFB1-5314-48C9-9C57-93EC8BC6184B",  # IUpdater
   "PLACEHOLDER-GUID-46ACF70B-AC13-406D-B53B-B2C4BF091FF6",  # IUpdateState
   "PLACEHOLDER-GUID-2FCD14AF-B645-4351-8359-E80A0E202A0B",  # ICompleteStatus
@@ -17,9 +18,8 @@ placeholder_guids = [
 ]
 
 uuid5_guids = []
-foreach(guid, placeholder_guids) {
-  uuid5_guids +=
-      [ guid + "=uuid5:$updater_product_full_name$chrome_version_full" ]
+foreach(guid, branding_only_placeholder_guids) {
+  uuid5_guids += [ guid + "=uuid5:$updater_product_full_name" ]
 }
 uuid5_guids = string_join(",", uuid5_guids)
 
@@ -32,17 +32,27 @@ midl("updater_idl_idl") {
   writes_tlb = true
 }
 
+# These GUIDs must depend on branding and version.
+branding_version_placeholder_guids = [
+  "PLACEHOLDER-GUID-C6CE92DB-72CA-42EF-8C98-6EE92481B3C9",  # UpdaterInternalLib
+  "PLACEHOLDER-GUID-1F87FE2F-D6A9-4711-9D11-8187705F8457",  # UpdaterControlClass
+  "PLACEHOLDER-GUID-526DA036-9BD3-4697-865A-DA12D37DFFCA",  # IUpdaterControl
+  "PLACEHOLDER-GUID-D272C794-2ACE-4584-B993-3B90C622BE65",  # IUpdaterControlCallback
+]
+
+uuid5_guids = []
+foreach(guid, branding_version_placeholder_guids) {
+  uuid5_guids +=
+      [ guid + "=uuid5:$updater_product_full_name$chrome_version_full" ]
+}
+uuid5_guids = string_join(",", uuid5_guids)
+
 midl("updater_internal_idl_idl") {
+  dynamic_guids = "ignore_proxy_stub," + uuid5_guids
+
   header_file = "updater_internal_idl.h"
   sources = [ "updater_internal_idl.template" ]
 
-  # TODO(crbug.com/1109612): these GUIDs must depend on branding and version.
-  defines = [
-    "IUPDATERCONTROL_IID=526DA036-9BD3-4697-865A-DA12D37DFFCA",
-    "IUPDATERCONTROLCALLBACK_IID=D272C794-2ACE-4584-B993-3B90C622BE65",
-    "UPDATER_INTERNAL_LIB_UUID=C6CE92DB-72CA-42EF-8C98-6EE92481B3C9",
-  ]
-
   writes_tlb = true
 }
 

chrome/updater/app/server/win/updater_idl.template

@@ -90,7 +90,7 @@ library UpdaterLib {
   }
 
   [
-    uuid(415FD747-D79E-42D7-93AC-1BA6E5FD4E93),
+    uuid(PLACEHOLDER-GUID-415FD747-D79E-42D7-93AC-1BA6E5FD4E93),
     helpstring("UpdaterService Class")
   ]
   coclass UpdaterServiceClass

chrome/updater/app/server/win/updater_internal_idl.template

@@ -12,7 +12,7 @@ import "ocidl.idl";
 [
   object,
   dual,
-  uuid(IUPDATERCONTROLCALLBACK_IID),
+  uuid(PLACEHOLDER-GUID-D272C794-2ACE-4584-B993-3B90C622BE65),
   helpstring("IUpdaterControlCallback Interface"),
   pointer_default(unique)
 ]
@@ -23,7 +23,7 @@ interface IUpdaterControlCallback : IUnknown {
 [
   object,
   dual,
-  uuid(IUPDATERCONTROL_IID),
+  uuid(PLACEHOLDER-GUID-526DA036-9BD3-4697-865A-DA12D37DFFCA),
   helpstring("IUpdaterControl Interface"),
   pointer_default(unique)
 ]
@@ -33,7 +33,7 @@ interface IUpdaterControl : IUnknown {
 };
 
 [
-  uuid(UPDATER_INTERNAL_LIB_UUID),
+  uuid(PLACEHOLDER-GUID-C6CE92DB-72CA-42EF-8C98-6EE92481B3C9),
   version(1.0),
   helpstring("Chromium Updater internal type library.")
 ]
@@ -41,7 +41,7 @@ library UpdaterInternalLib {
   importlib("stdole2.tlb");
 
   [
-    uuid(1F87FE2F-D6A9-4711-9D11-8187705F8457),
+    uuid(PLACEHOLDER-GUID-1F87FE2F-D6A9-4711-9D11-8187705F8457),
     helpstring("UpdaterControl Class")
   ]
   coclass UpdaterControlClass

third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_internal_idl.h

@@ -6,7 +6,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win64 (32b run), target_arch=ARM64 8.01.0622 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_internal_idl_i.c

@@ -8,7 +8,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win64 (32b run), target_arch=ARM64 8.01.0622 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/arm64/updater_internal_idl_p.c

@@ -6,7 +6,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win64 (32b run), target_arch=ARM64 8.01.0622 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_internal_idl.h

@@ -6,7 +6,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.xx.xxxx 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_internal_idl_i.c

@@ -8,7 +8,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.xx.xxxx 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/x64/updater_internal_idl_p.c

@@ -6,7 +6,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.xx.xxxx 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_internal_idl.h

@@ -6,7 +6,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.xx.xxxx 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_internal_idl_i.c

@@ -8,7 +8,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.xx.xxxx 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data 

third_party/win_build_output/midl/chrome/updater/app/server/win/x86/updater_internal_idl_p.c

@@ -6,7 +6,7 @@
  /* File created by MIDL compiler version 8.xx.xxxx */
 /* at a redacted point in time
  */
-/* Compiler settings for ../../chrome/updater/app/server/win/updater_internal_idl.template:
+/* Compiler settings for gen/chrome/updater/app/server/win/updater_internal_idl.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.xx.xxxx 
     protocol : dce , ms_ext, c_ext, robust
     error checks: allocation ref bounds_check enum stub_data