Adding a fourth omnibox prerender experiment.

chrome/browser/autocomplete/autocomplete_edit.cc

 // Copyright (c) 2011 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/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 195 matching lines @@
   return true;
 }
 
 bool AutocompleteEditModel::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(controller_->GetInstant());
 }
 
 void AutocompleteEditModel::OnChanged() {
   const AutocompleteMatch current_match = CurrentMatch();
 
-  string16 suggested_text;
-
-  // Confer with the NetworkActionPredictor to determine what action, if any,
-  // we should take. Get the recommended action here even if we don't need it
-  // so we can get stats for anyone who is opted in to UMA, but only get it if
-  // the user has actually typed something to avoid constructing it before it's
-  // needed. Note: This event is triggered as part of startup when the initial
-  // tab transitions to the start page.
+  NetworkActionPredictor::Action recommended_action =
+      NetworkActionPredictor::ACTION_NONE;
   NetworkActionPredictor* network_action_predictor = user_input_in_progress() ?
       profile_->GetNetworkActionPredictor() : NULL;
-  NetworkActionPredictor::Action recommended_action = network_action_predictor ?
-       network_action_predictor->RecommendAction(user_text_, current_match) :
-       NetworkActionPredictor::ACTION_NONE;
+  if (network_action_predictor) {
+    network_action_predictor->RegisterTransitionalMatches(user_text_,
+                                                          result());
+    // Confer with the NetworkActionPredictor to determine what action, if any,
+    // we should take. Get the recommended action here even if we don't need it
+    // so we can get stats for anyone who is opted in to UMA, but only get it if
+    // the user has actually typed something to avoid constructing it before
+    // it's needed. Note: This event is triggered as part of startup when the
+    // initial tab transitions to the start page.
+    recommended_action =
+        network_action_predictor->RecommendAction(user_text_, current_match);
+  }
+
   UMA_HISTOGRAM_ENUMERATION("NetworkActionPredictor.Action_" +
                             prerender::GetOmniboxHistogramSuffix(),
                             recommended_action,
                             NetworkActionPredictor::LAST_PREDICT_ACTION);
+  string16 suggested_text;
+
   if (DoInstant(current_match, &suggested_text)) {
     SetSuggestedText(suggested_text, instant_complete_behavior_);
   } else {
     switch (recommended_action) {
       case NetworkActionPredictor::ACTION_PRERENDER:
         DoPrerender(current_match);
         break;
       case NetworkActionPredictor::ACTION_PRECONNECT:
         DoPreconnect(current_match);
         break;
@@ skipping 144 matching lines @@
 
 void AutocompleteEditModel::Revert() {
   SetInputInProgress(false);
   paste_state_ = NONE;
   InternalSetUserText(string16());
   keyword_.clear();
   is_keyword_hint_ = false;
   has_temporary_text_ = false;
   view_->SetWindowTextAndCaretPos(permanent_text_,
                                   has_focus_ ? permanent_text_.length() : 0);
+  NetworkActionPredictor* network_action_predictor =
+      profile_->GetNetworkActionPredictor();
+  if (network_action_predictor)
+    network_action_predictor->ClearTransitionalMatches();
 }
 
 void AutocompleteEditModel::StartAutocomplete(
     bool has_selected_text,
     bool prevent_inline_autocomplete) const {
   bool keyword_is_selected = KeywordIsSelected();
   popup_->SetHoveredLine(AutocompletePopupModel::kNoMatch);
   // We don't explicitly clear AutocompletePopupModel::manually_selected_match,
   // as Start ends up invoking AutocompletePopupModel::OnResultChanged which
   // clears it.
@@ skipping 658 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }