Fix GCPW extension icon and event category display name

Bug: 1133586
Change-Id: I791e4e900936fbc9349d0742c93bc2a3f13700d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2439675Reviewed-by: Rakesh Soma <rakeshsoma@google.com>
Commit-Queue: Yusuf Sengul <yusufsn@google.com>
Cr-Commit-Position: refs/heads/master@{#812878}

chrome/credential_provider/extension/extension_strings.cc

@@ -9,7 +9,7 @@ namespace extension {
 
 const wchar_t kGCPWExtensionServiceName[] = L"GCPWExtension";
 
-const wchar_t kGCPWExtensionServiceDescription[] = L"GCPW extension service";
+const wchar_t kGCPWExtensionServiceDisplayName[] = L"GCPW Extension Service";
 
 const wchar_t kEnableGCPWExtension[] = L"enable_gcpw_extension";
 

chrome/credential_provider/extension/extension_strings.h

@@ -11,8 +11,8 @@ namespace extension {
 // Name of the GCPW extension service.
 extern const wchar_t kGCPWExtensionServiceName[];
 
-// Description of the GCPW extension service.
-extern const wchar_t kGCPWExtensionServiceDescription[];
+// Display name of the GCPW extension service.
+extern const wchar_t kGCPWExtensionServiceDisplayName[];
 
 // Registry which controls whether to install GCPW Extension.
 extern const wchar_t kEnableGCPWExtension[];

chrome/credential_provider/extension/os_service_manager.cc

@@ -33,7 +33,7 @@ DWORD OSServiceManager::InstallService(
   *sc_handle = ScopedScHandle(::CreateService(
       scm_handle.Get(),                     // SCM database
       kGCPWExtensionServiceName,            // name of service
-      kGCPWExtensionServiceDescription,     // service name to display
+      kGCPWExtensionServiceDisplayName,     // service name to display
       SERVICE_ALL_ACCESS,                   // desired access
       SERVICE_WIN32_OWN_PROCESS,            // service type
       SERVICE_AUTO_START,                   // start type

chrome/credential_provider/gaiacp/gaia_credential_provider.rgs

@@ -64,7 +64,7 @@ HKLM
 					{
 						ForceRemove GCPW
 						{
-							val CategoryCount = d '1'
+							val CategoryCount = d '2'
 							val CategoryMessageFile = s '%EVENTLOG_PATH%'
 							val EventMessageFile = s '%EVENTLOG_PATH%'
 							val ParameterMessageFile = s '%EVENTLOG_PATH%'