Revert of Omnibox Watcher: Don't Flag Incidents that are Paste+Enter

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright 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/ui/omnibox/omnibox_edit_model.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 737 matching lines @@
   ACMatches fake_single_entry_matches;
   fake_single_entry_matches.push_back(match);
   AutocompleteResult fake_single_entry_result;
   fake_single_entry_result.AppendMatches(fake_single_entry_matches);
   OmniboxLog log(
       input_text,
       just_deleted_text_,
       input_.type(),
       popup_model()->IsOpen(),
       (!popup_model()->IsOpen() || !pasted_text.empty()) ? 0 : index,
-      !pasted_text.empty(),  // is_paste_and_go
-      paste_state_ != NONE,  // last_action_was_paste
+      !pasted_text.empty(),
       -1,  // don't yet know tab ID; set later if appropriate
       ClassifyPage(),
       elapsed_time_since_user_first_modified_omnibox,
       match.allowed_to_be_default_match ? match.inline_autocompletion.length() :
           base::string16::npos,
       elapsed_time_since_last_change_to_default_match,
       (!popup_model()->IsOpen() || !pasted_text.empty()) ?
           fake_single_entry_result : result());
   DCHECK(!popup_model()->IsOpen() || !pasted_text.empty() ||
          (log.elapsed_time_since_user_first_modified_omnibox >=
@@ skipping 705 matching lines @@
   // Update state and notify view if the omnibox has focus and the caret
   // visibility changed.
   const bool was_caret_visible = is_caret_visible();
   focus_state_ = state;
   if (focus_state_ != OMNIBOX_FOCUS_NONE &&
       is_caret_visible() != was_caret_visible)
     view_->ApplyCaretVisibility();
 
   delegate_->OnFocusChanged(focus_state_, reason);
 }