Fix compilation on Windows with enable_printing=2.

chrome/browser/metrics/chrome_metrics_service_client.cc

 // Copyright 2014 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/browser/metrics/chrome_metrics_service_client.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 25 matching lines @@
 #include "chrome/common/render_messages.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/net/net_metrics_log_uploader.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/histogram_fetcher.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/metrics/android_metrics_provider.h"
-#else
+#endif
+
+#if defined(ENABLE_FULL_PRINTING)
 #include "chrome/browser/service_process/service_process_control.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/metrics/extensions_metrics_provider.h"
 #endif
 
 #if defined(ENABLE_PLUGINS)
 #include "chrome/browser/metrics/plugin_metrics_provider.h"
 #endif
@@ skipping 330 matching lines @@
   // Create a callback_task for OnHistogramSynchronizationDone.
   base::Closure callback = base::Bind(
       &ChromeMetricsServiceClient::OnHistogramSynchronizationDone,
       weak_ptr_factory_.GetWeakPtr());
 
   base::TimeDelta timeout =
       base::TimeDelta::FromMilliseconds(kMaxHistogramGatheringWaitDuration);
 
   DCHECK_EQ(num_async_histogram_fetches_in_progress_, 0);
 
-#if defined(OS_ANDROID)
+#if !defined(ENABLE_FULL_PRINTING)
   // Android has no service process.

[Lei Zhang, 2014/09/08 18:50:35]

remove android comment

[Vitaly Buka (NO REVIEWS), 2014/09/08 21:21:45]

Done.

   num_async_histogram_fetches_in_progress_ = 1;
-#else  // OS_ANDROID
+#else  // !ENABLE_FULL_PRINTING
   num_async_histogram_fetches_in_progress_ = 2;
   // Run requests to service and content in parallel.
   if (!ServiceProcessControl::GetInstance()->GetHistograms(callback, timeout)) {
     // Assume |num_async_histogram_fetches_in_progress_| is not changed by
     // |GetHistograms()|.
     DCHECK_EQ(num_async_histogram_fetches_in_progress_, 2);
     // Assign |num_async_histogram_fetches_in_progress_| above and decrement it
     // here to make code work even if |GetHistograms()| fired |callback|.
     --num_async_histogram_fetches_in_progress_;
   }
-#endif  // OS_ANDROID
+#endif  // !ENABLE_FULL_PRINTING
 
   // Set up the callback to task to call after we receive histograms from all
   // child processes. |timeout| specifies how long to wait before absolutely
   // calling us back on the task.
   content::FetchHistogramsAsynchronously(base::MessageLoop::current(), callback,
                                          timeout);
 }
 
 void ChromeMetricsServiceClient::OnHistogramSynchronizationDone() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 122 matching lines @@
   // Capture the histogram samples.
   if (dumps_with_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithCrash", dumps_with_crash);
   if (dumps_with_no_crash != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserDumpsWithNoCrash", dumps_with_no_crash);
   int total_dumps = dumps_with_crash + dumps_with_no_crash;
   if (total_dumps != 0)
     UMA_HISTOGRAM_COUNTS("Chrome.BrowserCrashDumpAttempts", total_dumps);
 }
 #endif  // defined(OS_WIN)