Fix multiple bugs preventing Windows crash uploading from working:

1) The code to initialize breakpad was guarded by an ifdef on O3D_ENABLE_BREAKPAD, which is never defined anywhere, so the feature was disabled.
2) The version string used the macro O3D_VERSION_NUMBER, which is never defined anywhere, so it sent the literal string "O3D_VERSION_NUMBER".
3) The upload URLs were outdated (though it seems the old ones are actually still functional).

TEST=added a deliberate crash and verified that it successfully uploads to the crash server
BUG=none

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

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

4 files changed, 11 insertions, 7 deletions

diff --git a/o3d/breakpad/breakpad.gyp b/o3d/breakpad/breakpad.gyp
index 7099432..d5cdd907 100644
--- a/o3d/breakpad/breakpad.gyp
+++ b/o3d/breakpad/breakpad.gyp
@@ -9,6 +9,7 @@
   'includes': [
     '../build/branding.gypi',
     '../build/common.gypi',
+    '../build/version.gypi',
   ],
   'target_defaults': {
     'include_dirs': [
@@ -17,6 +18,7 @@
       '../../breakpad/src',
     ],
     'defines': [
+      'O3D_PLUGIN_VERSION="<(plugin_version)"',
       'O3D_PLUGIN_INSTALLDIR_CSIDL=<(plugin_installdir_csidl)',
       'O3D_PLUGIN_VENDOR_DIRECTORY="<(plugin_vendor_directory)"',
       'O3D_PLUGIN_PRODUCT_DIRECTORY="<(plugin_product_directory)"',
diff --git a/o3d/breakpad/win/breakpad_config.cc b/o3d/breakpad/win/breakpad_config.cc
index 6ceb73d..c182a06 100644
--- a/o3d/breakpad/win/breakpad_config.cc
+++ b/o3d/breakpad/win/breakpad_config.cc
@@ -40,18 +40,22 @@
 #define _MAKE_LONG_STRING(string) L ## string
 #define MAKE_LONG_STRING(string) _MAKE_LONG_STRING(string)
 
-#define PRODUCT_VERSION_STRING MAKE_LONG_STRING(QUOTEME(O3D_VERSION_NUMBER))
+#define PRODUCT_VERSION_STRING MAKE_LONG_STRING(QUOTEME(O3D_PLUGIN_VERSION))
 
-// !!@ CURRENTLY WE'RE HARDCODING (win32 firefox) HERE!!
 wchar_t *kCrashReportProductName = L"O3D";  // [naming]
 
 wchar_t *kCrashReportProductVersion =
-    PRODUCT_VERSION_STRING L" (win32 firefox)";
+    PRODUCT_VERSION_STRING L" (win32)";
 
 // Crash report uploading configuration (used by reporter.exe)
 
+#ifdef NDEBUG
 // production server
-wchar_t *kCrashReportUrl = L"http://www.google.com/cr/report";
+wchar_t *kCrashReportUrl = L"http://clients2.google.com/cr/report";
+#else
+// staging server
+wchar_t *kCrashReportUrl = L"http://clients2.google.com/cr/staging_report";
+#endif
 
 wchar_t *kCrashReportProductParam = L"prod";
 wchar_t *kCrashReportVersionParam = L"ver";
diff --git a/o3d/breakpad/win/exception_handler_win32.cc b/o3d/breakpad/win/exception_handler_win32.cc
index 70a2607..c51eab0 100644
--- a/o3d/breakpad/win/exception_handler_win32.cc
+++ b/o3d/breakpad/win/exception_handler_win32.cc
@@ -198,7 +198,6 @@ static bool MinidumpCallback(const wchar_t *minidump_folder,
 
 
 void ExceptionManager::StartMonitoring() {
-#ifdef O3D_ENABLE_BREAKPAD
   if (exception_handler_) { return; }  // don't init more than once
 
   wchar_t temp_path[MAX_PATH];
@@ -208,5 +207,4 @@ void ExceptionManager::StartMonitoring() {
                                                              FilterCallback,
                                                              MinidumpCallback,
                                                              this, true);
-#endif
 }
diff --git a/o3d/statsreport/common/const_product.h b/o3d/statsreport/common/const_product.h
index ef4f624..1dc140a 100644
--- a/o3d/statsreport/common/const_product.h
+++ b/o3d/statsreport/common/const_product.h
@@ -46,7 +46,7 @@
 #define WIDEN(X) _WIDEN(X)
 
 #define PRODUCT_NAME_STRING "o3d"
-#define PRODUCT_VERSION_STRING QUOTEME(O3D_VERSION_NUMBER)
+#define PRODUCT_VERSION_STRING QUOTEME(O3D_PLUGIN_VERSION)
 
 #define PRODUCT_NAME_STRING_WIDE WIDEN(PRODUCT_NAME_STRING)