| Index: chrome/app/chrome_breakpad_client.cc
|
| ===================================================================
|
| --- chrome/app/chrome_breakpad_client.cc (revision 271530)
|
| +++ chrome/app/chrome_breakpad_client.cc (working copy)
|
| @@ -334,13 +334,10 @@
|
| }
|
|
|
| bool ChromeBreakpadClient::GetCollectStatsConsent() {
|
| - // Convert #define to a variable so that we can use if() rather than
|
| - // #if below and so at least compile-test the Chrome code in
|
| - // Chromium builds.
|
| -#if defined(GOOGLE_CHROME_BUILD)
|
| - bool is_chrome_build = true;
|
| +#if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD)
|
| + bool is_official_chrome_build = true;
|
| #else
|
| - bool is_chrome_build = false;
|
| + bool is_official_chrome_build = false;
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -357,9 +354,10 @@
|
| // TODO(jcivelli): we should not initialize the crash-reporter when it was not
|
| // enabled. Right now if it is disabled we still generate the minidumps but we
|
| // do not upload them.
|
| - return is_chrome_build;
|
| + return is_official_chrome_build;
|
| #else // !defined(OS_ANDROID)
|
| - return is_chrome_build && GoogleUpdateSettings::GetCollectStatsConsent();
|
| + return is_official_chrome_build &&
|
| + GoogleUpdateSettings::GetCollectStatsConsent();
|
| #endif // defined(OS_ANDROID)
|
| }
|
|
|
|
|