Get nacl building again for android

components/nacl/browser/nacl_browser.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 "components/nacl/browser/nacl_browser.h"
 
 #include "base/command_line.h"
 #include "base/files/file_proxy.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 130 matching lines @@
       irt_state_(NaClResourceUninitialized),
       validation_cache_file_path_(),
       validation_cache_is_enabled_(
           CheckEnvVar("NACL_VALIDATION_CACHE",
                       kValidationCacheEnabledByDefault)),
       validation_cache_is_modified_(false),
       validation_cache_state_(NaClResourceUninitialized),
       path_cache_(kFilePathCacheSize),
       ok_(true),
       weak_factory_(this) {
+#if defined(OS_ANDROID)
+      validation_cache_is_enabled_ = false;
+#endif

[bbudge, 2015/01/23 00:28:28]

It might be a little nicer if we set this to false in the initializer, and then
reverse this #if sense and CheckEnvVar in the body. Up to you though.

[sehr, 2015/01/30 01:24:00]

Done.

 }
 
 void NaClBrowser::SetDelegate(NaClBrowserDelegate* delegate) {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
   nacl_browser->browser_delegate_.reset(delegate);
 }
 
 NaClBrowserDelegate* NaClBrowser::GetDelegate() {
   // The delegate is not owned by the IO thread.  This accessor method can be
   // called from other threads.
@@ skipping 394 matching lines @@
 bool NaClBrowser::IsThrottled() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (crash_times_.size() != kMaxCrashesPerInterval) {
     return false;
   }
   base::TimeDelta delta = base::Time::Now() - crash_times_.front();
   return delta.InSeconds() <= kCrashesIntervalInSeconds;
 }
 
 }  // namespace nacl