Get nacl building again for android

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 "base/metrics/histogram.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.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"
+#if defined(ENABLE_EXTENSIONS)

[Lei Zhang, 2015/01/21 21:32:22]

nit: move these down to their own section.

[sehr, 2015/01/22 19:57:22]

Done.

 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#endif  // defined(ENABLE_EXTENSIONS)
 #include "ppapi/c/pp_errors.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.
 
 namespace {
 
@@ skipping 172 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;
 }