Merge 150928 - Fix a bad inversion of logic (see OnCanThrottleRequest) and a bug

chrome/browser/net/chrome_network_delegate.h

 // Copyright (c) 2012 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_NET_CHROME_NETWORK_DELEGATE_H_
 #define CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 24 matching lines @@
   // otherwise, the settings are enforced on all observed network requests.
   ChromeNetworkDelegate(
       ExtensionEventRouterForwarder* event_router,
       ExtensionInfoMap* extension_info_map,
       const policy::URLBlacklistManager* url_blacklist_manager,
       void* profile,
       CookieSettings* cookie_settings,
       BooleanPrefMember* enable_referrers);
   virtual ~ChromeNetworkDelegate();
 
-  // Causes |OnCanThrottleRequest| to never return true.
-  void NeverThrottleRequests();
+  // Causes |OnCanThrottleRequest| to always return false, for all
+  // instances of this object.
+  static void NeverThrottleRequests();
 
   // Binds |enable_referrers| to |pref_service| and moves it to the IO thread.
   // This method should be called on the UI thread.
   static void InitializeReferrersEnabled(BooleanPrefMember* enable_referrers,
                                          PrefService* pref_service);
 
   // When called, all file:// URLs will now be accessible.  If this is not
   // called, then some platforms restrict access to file:// paths.
   static void AllowAccessToAllFiles();
 
@@ skipping 42 matching lines @@
 
   scoped_refptr<ExtensionEventRouterForwarder> event_router_;
   void* profile_;
   scoped_refptr<CookieSettings> cookie_settings_;
 
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   // Weak, owned by our owner.
   BooleanPrefMember* enable_referrers_;
 
-  // True if OnCanThrottleRequest should always return false.
-  bool never_throttle_requests_;
-
   // Weak, owned by our owner.
   const policy::URLBlacklistManager* url_blacklist_manager_;
 
   // When true, allow access to all file:// URLs.
   static bool g_allow_file_access_;
 
+  // True if OnCanThrottleRequest should always return false.
+  //
+  // Note: This needs to be static as the instance of
+  // ChromeNetworkDelegate used may change over time, and we need to
+  // set this variable once at start-up time.  It is effectively
+  // static anyway since it is based on a command-line flag.
+  static bool g_never_throttle_requests_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_NETWORK_DELEGATE_H_