| Index: chrome/browser/metrics/chrome_metrics_service_client.cc
|
| diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
| index 2cd3fb92a54c0f2667965c85e613aade8432ce18..c857f00e39929714fa4add900b817def3534f49e 100644
|
| --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
|
| +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
|
| @@ -45,7 +45,7 @@
|
| #include "chrome/browser/metrics/android_metrics_provider.h"
|
| #endif
|
|
|
| -#if defined(ENABLE_FULL_PRINTING)
|
| +#if defined(ENABLE_PRINT_PREVIEW)
|
| #include "chrome/browser/service_process/service_process_control.h"
|
| #endif
|
|
|
| @@ -398,9 +398,9 @@ void ChromeMetricsServiceClient::OnMemoryDetailCollectionDone() {
|
|
|
| DCHECK_EQ(num_async_histogram_fetches_in_progress_, 0);
|
|
|
| -#if !defined(ENABLE_FULL_PRINTING)
|
| +#if !defined(ENABLE_PRINT_PREVIEW)
|
| num_async_histogram_fetches_in_progress_ = 1;
|
| -#else // !ENABLE_FULL_PRINTING
|
| +#else // !ENABLE_PRINT_PREVIEW
|
| num_async_histogram_fetches_in_progress_ = 2;
|
| // Run requests to service and content in parallel.
|
| if (!ServiceProcessControl::GetInstance()->GetHistograms(callback, timeout)) {
|
| @@ -411,7 +411,7 @@ void ChromeMetricsServiceClient::OnMemoryDetailCollectionDone() {
|
| // here to make code work even if |GetHistograms()| fired |callback|.
|
| --num_async_histogram_fetches_in_progress_;
|
| }
|
| -#endif // !ENABLE_FULL_PRINTING
|
| +#endif // !ENABLE_PRINT_PREVIEW
|
|
|
| // Set up the callback to task to call after we receive histograms from all
|
| // child processes. |timeout| specifies how long to wait before absolutely
|
|
|