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

chrome/browser/net/chrome_network_delegate.cc

 // 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.
 
 #include "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ skipping 33 matching lines @@
 using content::ResourceRequestInfo;
 
 // By default we don't allow access to all file:// urls on ChromeOS but we do on
 // other platforms.
 #if defined(OS_CHROMEOS)
 bool ChromeNetworkDelegate::g_allow_file_access_ = false;
 #else
 bool ChromeNetworkDelegate::g_allow_file_access_ = true;
 #endif
 
+// This remains false unless the --disable-extensions-http-throttling
+// flag is passed to the browser.
+bool ChromeNetworkDelegate::g_never_throttle_requests_ = false;
+
 namespace {
 
 // If the |request| failed due to problems with a proxy, forward the error to
 // the proxy extension API.
 void ForwardProxyErrors(net::URLRequest* request,
                         ExtensionEventRouterForwarder* event_router,
                         void* profile) {
   if (request->status().status() == net::URLRequestStatus::FAILED) {
     switch (request->status().error()) {
       case net::ERR_PROXY_AUTH_UNSUPPORTED:
@@ skipping 60 matching lines @@
     ExtensionInfoMap* extension_info_map,
     const policy::URLBlacklistManager* url_blacklist_manager,
     void* profile,
     CookieSettings* cookie_settings,
     BooleanPrefMember* enable_referrers)
     : event_router_(event_router),
       profile_(profile),
       cookie_settings_(cookie_settings),
       extension_info_map_(extension_info_map),
       enable_referrers_(enable_referrers),
-      never_throttle_requests_(false),
       url_blacklist_manager_(url_blacklist_manager) {
   DCHECK(event_router);
   DCHECK(enable_referrers);
   DCHECK(!profile || cookie_settings);
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
+// static
 void ChromeNetworkDelegate::NeverThrottleRequests() {
-  never_throttle_requests_ = true;
+  g_never_throttle_requests_ = true;
 }
 
 // static
 void ChromeNetworkDelegate::InitializeReferrersEnabled(
     BooleanPrefMember* enable_referrers,
     PrefService* pref_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL);
   enable_referrers->MoveToThread(BrowserThread::IO);
 }
@@ skipping 202 matching lines @@
     }
   }
   return false;
 #else
   return true;
 #endif  // defined(OS_CHROMEOS)
 }
 
 bool ChromeNetworkDelegate::OnCanThrottleRequest(
     const net::URLRequest& request) const {
-  if (never_throttle_requests_) {
+  if (g_never_throttle_requests_) {
     return false;
   }
 
-  return request.first_party_for_cookies().scheme() !=
+  return request.first_party_for_cookies().scheme() ==
       chrome::kExtensionScheme;
 }
 
 int ChromeNetworkDelegate::OnBeforeSocketStreamConnect(
     net::SocketStream* socket,
     const net::CompletionCallback& callback) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url_blacklist_manager_ &&
       url_blacklist_manager_->IsURLBlocked(socket->url())) {
     // URL access blocked by policy.
     socket->net_log()->AddEvent(
         net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
         net::NetLog::StringCallback("url",
                                     &socket->url().possibly_invalid_spec()));
     return net::ERR_NETWORK_ACCESS_DENIED;
   }
 #endif
   return net::OK;
 }