Get nacl building again for android

chrome/browser/nacl_host/nacl_browser_delegate_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_
 #define CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_
 
 #include <set>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "components/nacl/browser/nacl_browser_delegate.h"

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

nit: blank line to separate the #if from the above #includes.

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

Done.

+#if defined(ENABLE_EXTENSIONS)
 #include "extensions/common/url_pattern.h"
+#endif
 
 namespace extensions {

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

It seems strange that this isn't in the above #ifdef.

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

Merged into the ifdef.

 class InfoMap;
 }
 
 class ProfileManager;
 
 class NaClBrowserDelegateImpl : public NaClBrowserDelegate {
  public:
   explicit NaClBrowserDelegateImpl(ProfileManager* profile_manager);
   ~NaClBrowserDelegateImpl() override;
 
@@ skipping 18 matching lines @@
   bool IsNonSfiModeAllowed(const base::FilePath& profile_directory,
                            const GURL& manifest_url) override;
 
  private:
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<extensions::InfoMap> GetExtensionInfoMap(
       const base::FilePath& profile_directory);
 #endif
 
   ProfileManager* profile_manager_;
+#if defined(ENABLE_EXTENSIONS)
   std::vector<URLPattern> debug_patterns_;
+#endif
   bool inverse_debug_patterns_;
   std::set<std::string> allowed_nonsfi_origins_;
   DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl);
 };
 
 
 #endif  // CHROME_BROWSER_NACL_HOST_NACL_BROWSER_DELEGATE_IMPL_H_