Rewrite of chrome.exe startup code...

chrome/app/breakpad_win.cc

 // Copyright (c) 2009 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 "chrome/app/breakpad_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <tchar.h>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/registry.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "chrome/app/google_update_client.h"
 #include "chrome/app/hard_error_handler_win.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 
 namespace {
 
 const wchar_t kGoogleUpdatePipeName[] = L"\\\\.\\pipe\\GoogleCrashServices\\";
@@ skipping 16 matching lines @@
 // breakpad's CustomInfoEntry raises an invalid_parameter error if the string
 // we want to set is longer.
 std::wstring TrimToBreakpadMax(const std::wstring& str) {
   std::wstring shorter(str);
   return shorter.substr(0,
       google_breakpad::CustomInfoEntry::kValueMaxLength - 1);
 }
 
 // Returns the custom info structure based on the dll in parameter and the
 // process type.
-static google_breakpad::CustomClientInfo* custom_info = NULL;
 google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& dll_path,
                                                  const std::wstring& type) {
   scoped_ptr<FileVersionInfo>
       version_info(FileVersionInfo::CreateFileVersionInfo(dll_path));
 
   std::wstring version, product;
   if (version_info.get()) {
     // Get the information from the file.
     product = version_info->product_short_name();
     version = version_info->product_version();
@@ skipping 307 matching lines @@
       if (QueueUserWorkItem(
               &InitCrashReporterThread,
               info.release(),
               WT_EXECUTELONGFUNCTION) == 0) {
         // We failed to queue to the worker pool, initialize in this thread.
         InitCrashReporterThread(info.release());
       }
     }
   }
 }