Get nacl building again for android

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 122 matching lines @@
 
 std::string NaClBrowserDelegateImpl::GetVersionString() const {
   return chrome::VersionInfo().CreateVersionString();
 }
 
 ppapi::host::HostFactory* NaClBrowserDelegateImpl::CreatePpapiHostFactory(
     content::BrowserPpapiHost* ppapi_host) {
   return new chrome::ChromeBrowserPepperHostFactory(ppapi_host);
 }
 
 void NaClBrowserDelegateImpl::SetDebugPatterns(std::string debug_patterns) {

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

BTW, would you mind making |debug_patterns| const ref while you are here?

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

Done.

+#if defined(ENABLE_EXTENSIONS)
   if (!debug_patterns.empty() && debug_patterns[0] == '!') {
     inverse_debug_patterns_ = true;
     debug_patterns.erase(0, 1);
   }
   if (debug_patterns.empty()) {
     return;
   }
   std::vector<std::string> patterns;
   base::SplitString(debug_patterns, ',', &patterns);
   for (std::vector<std::string>::iterator iter = patterns.begin();
        iter != patterns.end(); ++iter) {
     // Allow chrome:// schema, which is used to filter out the internal
     // PNaCl translator. Also allow chrome-extension:// schema (which
     // can have NaCl modules). The default is to disallow these schema
     // since they can be dangerous in the context of chrome extension
     // permissions, but they are okay here, for NaCl GDB avoidance.
     URLPattern pattern(URLPattern::SCHEME_ALL);
     if (pattern.Parse(*iter) == URLPattern::PARSE_SUCCESS) {
       // If URL pattern has scheme equal to *, Parse method resets valid
       // schemes mask to http and https only, so we need to reset it after
       // Parse to re-include chrome-extension and chrome schema.
       pattern.SetValidSchemes(URLPattern::SCHEME_ALL);
       debug_patterns_.push_back(pattern);
     }
   }
+#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 bool NaClBrowserDelegateImpl::URLMatchesDebugPatterns(
     const GURL& manifest_url) {
+#if defined(ENABLE_EXTENSIONS)
   // Empty patterns are forbidden so we ignore them.
   if (debug_patterns_.empty()) {
     return true;
   }
   bool matches = false;
   for (std::vector<URLPattern>::iterator iter = debug_patterns_.begin();
        iter != debug_patterns_.end(); ++iter) {
     if (iter->MatchesURL(manifest_url)) {
       matches = true;
       break;
     }
   }
   if (inverse_debug_patterns_) {
     return !matches;
   } else {
     return matches;
   }
+#else
+  return false;
+#endif  // defined(ENABLE_EXTENSIONS)
 }
 
 // This function is security sensitive.  Be sure to check with a security
 // person before you modify it.
 bool NaClBrowserDelegateImpl::MapUrlToLocalFilePath(

[bbudge, 2015/01/21 21:22:07]

It seems like the body of this fn could also be excluded when extensions aren't
enabled.

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

Looks like it already is excluded.

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

It is already excluded, I think.

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

Acknowledged.

     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
@@ skipping 24 matching lines @@
     const base::FilePath& profile_directory) {
   // 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.get());
   return extension_info_map;
 }
 #endif