Merge 219210 "Predictor::PreconnectUsage: mark preconnect as use..."

> Predictor::PreconnectUsage: mark preconnect as used when appeared in navigation chain.
> 
> The preconnect was not marked as used when it appeared in navigation chain. This caused inconsistency of Net.PreconnectTriggerUsed (precision UMA) to Net.PreconnectedLinkNavigations (recall UMA).
> 
> BUG=235361
> 
> Review URL: https://chromiumcodereview.appspot.com/23264033

TBR=kouhei@chromium.org

Review URL: https://codereview.chromium.org/24401003

git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@224850 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 4 deletions

diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
index 6e8e2fe..2ddb93f 100644
--- a/chrome/browser/net/predictor.cc
+++ b/chrome/browser/net/predictor.cc
@@ -221,11 +221,8 @@ void Predictor::PreconnectUsage::ObserveNavigationChain(
 
   GURL canonical_url(Predictor::CanonicalizeUrl(url_chain.back()));
 
-  // Record the preconnect trigger for the url as used if exist
   MRUPreconnects::iterator itPreconnect = mru_preconnects_.Peek(canonical_url);
   bool was_preconnected = (itPreconnect != mru_preconnects_.end());
-  if (was_preconnected)
-    itPreconnect->second.set_was_used();
 
   // This is an UMA which was named incorrectly. This actually measures the
   // ratio of URLRequests which have used a preconnected session.
@@ -251,8 +248,10 @@ void Predictor::PreconnectUsage::ObserveLinkNavigation(const GURL& url) {
     MRUPreconnects::iterator itPreconnect =
         mru_preconnects_.Peek(canonical_url);
     bool was_preconnected = (itPreconnect != mru_preconnects_.end());
-    if (was_preconnected)
+    if (was_preconnected) {
+      itPreconnect->second.set_was_used();
       did_use_preconnect = true;
+    }
   }
 
   UMA_HISTOGRAM_BOOLEAN("Net.PreconnectedLinkNavigations", did_use_preconnect);