Remove dependency from breakpad files on chrome switches.

chrome/app/breakpad_win.cc

 // Copyright (c) 2012 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 <shellapi.h>
 #include <tchar.h>
 #include <userenv.h>
 #include <windows.h>
 #include <winnt.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/environment.h"
-#include "base/file_version_info.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "base/win/pe_image.h"
 #include "base/win/registry.h"
 #include "base/win/win_util.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "chrome/app/breakpad_field_trial_win.h"
 #include "chrome/app/hard_error_handler_win.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_result_codes.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/install_util.h"
 #include "components/breakpad/breakpad_client.h"
+#include "content/public/common/content_switches.h"
 #include "policy/policy_constants.h"
 #include "sandbox/win/src/nt_internals.h"
 #include "sandbox/win/src/sidestep/preamble_patcher.h"
 
 // userenv.dll is required for GetProfileType().
 #pragma comment(lib, "userenv.lib")
 
 #pragma intrinsic(_AddressOfReturnAddress)
 #pragma intrinsic(_ReturnAddress)
 
@@ skipping 302 matching lines @@
     base::SStringPrintf(&profile_type, L"error %u", last_error);
   }
   return profile_type;
 }
 
 // Returns the custom info structure based on the dll in parameter and the
 // process type.
 google_breakpad::CustomClientInfo* GetCustomInfo(const std::wstring& exe_path,
                                                  const std::wstring& type,
                                                  const std::wstring& channel) {
-  scoped_ptr<FileVersionInfo>
-      version_info(FileVersionInfo::CreateFileVersionInfo(
-          base::FilePath(exe_path)));
-
-  std::wstring version, product;
-  std::wstring special_build;
-  if (version_info.get()) {
-    // Get the information from the file.
-    version = version_info->product_version();
-    if (!version_info->is_official_build())
-      version.append(L"-devel");
-
-    const CommandLine& command = *CommandLine::ForCurrentProcess();
-    if (command.HasSwitch(switches::kChromeFrame)) {
-      product = L"ChromeFrame";
-    } else {
-      product = version_info->product_short_name();
-    }
-
-    special_build = version_info->special_build();
-  } else {
-    // No version info found. Make up the values.
-     product = L"Chrome";
-     version = L"0.0.0.0-devel";
-  }
+  base::string16 version, product;
+  base::string16 special_build;
+  breakpad::GetBreakpadClient()->GetProductNameAndVersion(
+      base::FilePath(exe_path), &product, &version, &special_build);
 
   // We only expect this method to be called once per process.
   DCHECK(!g_custom_entries);
   g_custom_entries = new std::vector<google_breakpad::CustomInfoEntry>;
 
   // Common g_custom_entries.
   g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"ver", version.c_str()));
+      google_breakpad::CustomInfoEntry(L"ver", UTF16ToWide(version).c_str()));
   g_custom_entries->push_back(
-      google_breakpad::CustomInfoEntry(L"prod", product.c_str()));
+      google_breakpad::CustomInfoEntry(L"prod", UTF16ToWide(product).c_str()));
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"plat", L"Win32"));
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"ptype", type.c_str()));
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"channel", channel.c_str()));
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"profile-type",
                                        GetProfileType().c_str()));
 
   if (g_deferred_crash_uploads)
     g_custom_entries->push_back(
         google_breakpad::CustomInfoEntry(L"deferred-upload", L"true"));
 
   if (!special_build.empty())
-    g_custom_entries->push_back(
-        google_breakpad::CustomInfoEntry(L"special", special_build.c_str()));
+    g_custom_entries->push_back(google_breakpad::CustomInfoEntry(
+        L"special", UTF16ToWide(special_build).c_str()));
 
   g_num_of_extensions_offset = g_custom_entries->size();
   g_custom_entries->push_back(
       google_breakpad::CustomInfoEntry(L"num-extensions", L"N/A"));
 
   g_extension_ids_offset = g_custom_entries->size();
   // one-based index for the name suffix.
   for (int i = 1; i <= kMaxReportedActiveExtensions; ++i) {
     g_custom_entries->push_back(google_breakpad::CustomInfoEntry(
         base::StringPrintf(L"extension-%i", i).c_str(), L""));
@@ skipping 719 matching lines @@
   previous_filter = SetUnhandledExceptionFilter(filter);
 }
 
 void StringVectorToCStringVector(const std::vector<std::wstring>& wstrings,
                                  std::vector<const wchar_t*>* cstrings) {
   cstrings->clear();
   cstrings->reserve(wstrings.size());
   for (size_t i = 0; i < wstrings.size(); ++i)
     cstrings->push_back(wstrings[i].c_str());
 }