Refactor SetClientID such that metrics rather than crash backs up the client id in Google Update set

components/breakpad/app/breakpad_mac.mm

 // Copyright 2013 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.
 
 #import "components/breakpad/app/breakpad_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
 #include "base/auto_reset.h"
@@ skipping 220 matching lines @@
   GetBreakpadClient()->RegisterCrashKeys();
 
   // Set Breakpad metadata values.  These values are added to Info.plist during
   // the branded Google Chrome.app build.
   SetCrashKeyValue(@"ver", [info_dictionary objectForKey:@BREAKPAD_VERSION]);
   SetCrashKeyValue(@"prod", [info_dictionary objectForKey:@BREAKPAD_PRODUCT]);
   SetCrashKeyValue(@"plat", @"OS X");
 
   if (!is_browser) {
     // Get the guid from the command line switch.
-    std::string guid =
+    std::string client_guid =
         command_line->GetSwitchValueASCII(switches::kEnableCrashReporter);
-    GetBreakpadClient()->SetClientID(guid);
+    GetBreakpadClient()->SetBreakpadClientIdFromGUID(client_guid);
   }
 
   logging::SetLogMessageHandler(&FatalMessageHandler);
   base::debug::SetDumpWithoutCrashingFunction(&DumpHelper::DumpWithoutCrashing);
 
   // abort() sends SIGABRT, which breakpad does not intercept.
   // Register a signal handler to crash in a way breakpad will
   // intercept.
   struct sigaction sigact;
   memset(&sigact, 0, sizeof(sigact));
@@ skipping 16 matching lines @@
 
   // Store process type in crash dump.
   SetCrashKeyValue(@"ptype", process_type);
 
   NSString* pid_value =
       [NSString stringWithFormat:@"%d", static_cast<unsigned int>(getpid())];
   SetCrashKeyValue(@"pid", pid_value);
 }
 
 }  // namespace breakpad