Set version string for Breakpad reporting by ceee_ie.dll

and ceee_broker.exe.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/5113001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66648 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 7 deletions

diff --git a/ceee/ie/common/common.gyp b/ceee/ie/common/common.gyp
index b6fb013..94e79f4 100644
--- a/ceee/ie/common/common.gyp
+++ b/ceee/ie/common/common.gyp
@@ -56,6 +56,7 @@
         '../../../ceee/common/common.gyp:initializing_coclass',
         '../../../ceee/common/common.gyp:ceee_common',
         '../../../ceee/testing/utils/test_utils.gyp:test_utils',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
         '<(DEPTH)/chrome_frame/chrome_frame.gyp:chrome_tab_idl',
         '../plugin/toolband/toolband.gyp:toolband_idl',
       ],
@@ -106,7 +107,7 @@
         '../../../chrome/common/extensions/user_script.h',
       ],
       'include_dirs': [
-        # For chrome_tab.h
+        # For chrome_tab.h and version.h
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'direct_dependent_settings': {
diff --git a/ceee/ie/common/crash_reporter.cc b/ceee/ie/common/crash_reporter.cc
index 4ed9b5c..6108672 100644
--- a/ceee/ie/common/crash_reporter.cc
+++ b/ceee/ie/common/crash_reporter.cc
@@ -7,8 +7,11 @@
 #include "ceee/ie/common/crash_reporter.h"
 
 #include "base/logging.h"
+#include "base/stringize_macros.h"
 #include "ceee/ie/common/ceee_module_util.h"
 
+#include "version.h"  // NOLINT
+
 const wchar_t kGoogleUpdatePipeName[] =
     L"\\\\.\\pipe\\GoogleCrashServices\\S-1-5-18";
 
@@ -16,9 +19,8 @@ CrashReporter::CrashReporter(const wchar_t* component_name)
     : exception_handler_(NULL) {
   // Initialize the custom data that will be used to identify the client
   // when reporting a crash.
-  // TODO(jeffbailey@google.com): Inherit Chrome's version number.
-  // (bb3143594).
-  google_breakpad::CustomInfoEntry ver_entry(L"ver", L"Ver.Goes.Here");
+  google_breakpad::CustomInfoEntry ver_entry(
+      L"ver", TO_L_STRING(CHROME_VERSION_STRING));
   google_breakpad::CustomInfoEntry prod_entry(L"prod", L"CEEE_IE");
   google_breakpad::CustomInfoEntry plat_entry(L"plat", L"Win32");
   google_breakpad::CustomInfoEntry type_entry(L"ptype", component_name);
diff --git a/ceee/ie/plugin/toolband/toolband.gyp b/ceee/ie/plugin/toolband/toolband.gyp
index 8ece483..179156f 100644
--- a/ceee/ie/plugin/toolband/toolband.gyp
+++ b/ceee/ie/plugin/toolband/toolband.gyp
@@ -86,11 +86,16 @@
             'crash_reporting.gyp:crash_report',
         '../../../../base/base.gyp:base',
         '../../../../breakpad/breakpad.gyp:breakpad_handler',
+        '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
       ],
       'sources': [
         'toolband_module_reporting.cc',
         'toolband_module_reporting.h',
       ],
+      'include_dirs': [
+        # For version.h
+        '<(SHARED_INTERMEDIATE_DIR)',
+      ],
     },
     {
       'target_name': 'toolband_idl',
diff --git a/ceee/ie/plugin/toolband/toolband_module_reporting.cc b/ceee/ie/plugin/toolband/toolband_module_reporting.cc
index c1d5f58..afe0cdd 100644
--- a/ceee/ie/plugin/toolband/toolband_module_reporting.cc
+++ b/ceee/ie/plugin/toolband/toolband_module_reporting.cc
@@ -8,17 +8,19 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/stringize_macros.h"
 #include "ceee/ie/common/ceee_module_util.h"
 
+#include "version.h"  // NOLINT
+
 // Well known SID for the system principal.
 const wchar_t kSystemPrincipalSid[] = L"S-1-5-18";
 
 // Returns the custom info structure based on the dll in parameter and the
 // process type.
 google_breakpad::CustomClientInfo* GetCustomInfo() {
-  // TODO(jeffbailey@google.com): Put in a real version.
-  // (bb3143594).
-  static google_breakpad::CustomInfoEntry ver_entry(L"ver", L"Ver.Goes.Here");
+  static google_breakpad::CustomInfoEntry ver_entry(
+      L"ver", TO_L_STRING(CHROME_VERSION_STRING));
   static google_breakpad::CustomInfoEntry prod_entry(L"prod", L"CEEE_IE");
   static google_breakpad::CustomInfoEntry plat_entry(L"plat", L"Win32");
   static google_breakpad::CustomInfoEntry type_entry(L"ptype", L"ie_plugin");