Added extension macro checks for android plugin files.

chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

 // Copyright 2013 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/nacl_host/nacl_browser_delegate_impl.h"
 
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
@@ skipping 44 matching lines @@
     const content::BrowserPpapiHost::OnKeepaliveInstanceData& instance_data,
     const base::FilePath& profile_data_directory) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   // Only one instance will exist for NaCl embeds, even when more than one
   // embed of the same plugin exists on the same page.
   DCHECK(instance_data.size() == 1);
   if (instance_data.size() < 1)
     return;
 
+#if defined(ENABLE_EXTENSIONS)
   extensions::ProcessManager::OnKeepaliveFromPlugin(
       instance_data[0].render_process_id,
       instance_data[0].render_frame_id,
       instance_data[0].document_url.host());
+#endif
 }
 
 // Calls OnKeepaliveOnUIThread on UI thread.
 void OnKeepalive(
     const content::BrowserPpapiHost::OnKeepaliveInstanceData& instance_data,
     const base::FilePath& profile_data_directory) {
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
                                    base::Bind(&OnKeepaliveOnUIThread,
                                               instance_data,
@@ skipping 104 matching lines @@
   }
 }
 
 // This function is security sensitive.  Be sure to check with a security
 // person before you modify it.
 bool NaClBrowserDelegateImpl::MapUrlToLocalFilePath(
     const GURL& file_url,
     bool use_blocking_api,
     const base::FilePath& profile_directory,
     base::FilePath* file_path) {
+#if defined(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::InfoMap> extension_info_map =
       GetExtensionInfoMap(profile_directory);
   return extension_info_map->MapUrlToLocalFilePath(
       file_url, use_blocking_api, file_path);
+#else
+  return false;
+#endif
 }
 
 content::BrowserPpapiHost::OnKeepaliveCallback
 NaClBrowserDelegateImpl::GetOnKeepaliveCallback() {
   return base::Bind(&OnKeepalive);
 }
 
 bool NaClBrowserDelegateImpl::IsNonSfiModeAllowed(
     const base::FilePath& profile_directory,
     const GURL& manifest_url) {
+#if defined(ENABLE_EXTENSIONS)
   const extensions::ExtensionSet* extension_set =
       &GetExtensionInfoMap(profile_directory)->extensions();
   return chrome::IsExtensionOrSharedModuleWhitelisted(
       manifest_url, extension_set, allowed_nonsfi_origins_);
+#else
+  return false;
+#endif
 }
 
 scoped_refptr<extensions::InfoMap> NaClBrowserDelegateImpl::GetExtensionInfoMap(
     const base::FilePath& profile_directory) {
+#if defined(ENABLE_EXTENSIONS)
   // Get the profile associated with the renderer.
   Profile* profile = profile_manager_->GetProfileByPath(profile_directory);
   DCHECK(profile);
   scoped_refptr<extensions::InfoMap> extension_info_map =
       extensions::ExtensionSystem::Get(profile)->info_map();
   DCHECK(extension_info_map);
   return extension_info_map;
+#else
+  return NULL;

[Mark Seaborn, 2014/08/19 23:41:30]

It doesn't look like all the call sites handle GetExtensionInfoMap() returning
NULL (e.g. above).  Should this be a CHECK(false), or should the whole function
be in the #if?

[David Yen, 2014/08/21 17:31:48]

This function is private so I believe you are right, the correct thing to do
would be to #ifdef out the entire function.

+#endif
 }