Merge m-c to inbound

netwerk/protocol/http/nsHttpConnection.h

@@ -165,6 +165,7 @@ public:
     void EndIdleMonitoring();
 
     bool UsingSpdy() { return mUsingSpdy; }
+    bool EverUsedSpdy() { return mEverUsedSpdy; }
 
     // true when connection SSL NPN phase is complete and we know
     // authoritatively whether UsingSpdy() or not.

netwerk/protocol/http/nsHttpConnectionMgr.cpp

@@ -1212,7 +1212,7 @@ nsHttpConnectionMgr::RestrictConnections(nsConnectionEntry *ent)
         bool confirmedRestrict = false;
         for (PRUint32 index = 0; index < ent->mActiveConns.Length(); ++index) {
             nsHttpConnection *conn = ent->mActiveConns[index];
-            if (!conn->ReportedNPN() || conn->CanDirectlyActivate()) {
+            if (!conn->ReportedNPN() || conn->EverUsedSpdy()) {
                 confirmedRestrict = true;
                 break;
             }