Revert of Move ENABLE_PEPPER_CDMS to a buildflag header.

chrome/renderer/pepper/pepper_uma_host.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/renderer/pepper/pepper_uma_host.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "content/public/renderer/pepper_plugin_instance.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/features/features.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ skipping 12 matching lines @@
     "01E9FFA9A8F3C18271FE91BEE46207F3B81755CC",  // see http://crbug.com/521189
     "97B23E01B2AA064E8332EE43A7A85C628AADC3F2",  // see http://crbug.com/521189
 };
 
 const char* const kWhitelistedHistogramPrefixes[] = {
     "22F67DA2061FFC4DC9A4974036348D9C38C22919",  // see http://crbug.com/390221
     "3FEA4650221C5E6C39CF5C5C9F464FF74EAB6CE1",  // see http://crbug.com/521189
 };
 
 const char* const kWhitelistedPluginBaseNames[] = {
-#if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS)
+#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
     kWidevineCdmAdapterFileName,  // see http://crbug.com/368743
                                   // and http://crbug.com/410630
 #endif
     ChromeContentClient::kPDFPluginPath,
 };
 
 std::string HashPrefix(const std::string& histogram) {
   const std::string id_hash =
       base::SHA1HashString(histogram.substr(0, histogram.find('.')));
   DCHECK_EQ(id_hash.length(), base::kSHA1Length);
@@ skipping 151 matching lines @@
     ppapi::host::HostMessageContext* context) {
   if (!IsPluginWhitelisted())
     return PP_ERROR_NOACCESS;
   bool enabled = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsCrashReportingEnabled(&enabled));
   if (enabled)
     return PP_OK;
   return PP_ERROR_FAILED;
 }