Misc. cleanup:

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 <string>
 
 #include "base/auto_reset.h"
 #include "base/format_macros.h"
@@ skipping 878 matching lines @@
   return true;
 }
 
 void OmniboxEditModel::OnControlKeyChanged(bool pressed) {
   // TODO(beaudoin): Remove this function entirely and all the code that calls
   // it.
 }
 
 void OmniboxEditModel::OnUpOrDownKeyPressed(int count) {
   // NOTE: This purposefully doesn't trigger any code that resets paste_state_.
-  if (!popup_model()->IsOpen()) {
-    if (!query_in_progress()) {
-      // The popup is neither open nor working on a query already.  So, start an
-      // autocomplete query for the current text.  This also sets
-      // user_input_in_progress_ to true, which we want: if the user has started
-      // to interact with the popup, changing the permanent_text_ shouldn't
-      // change the displayed text.
-      // Note: This does not force the popup to open immediately.
-      // TODO(pkasting): We should, in fact, force this particular query to open
-      // the popup immediately.
-      if (!user_input_in_progress_)
-        InternalSetUserText(permanent_text_);
-      view_->UpdatePopup();
-    } else {
-      // TODO(pkasting): The popup is working on a query but is not open.  We
-      // should force it to open immediately.
-    }
-  } else {
+  if (popup_model()->IsOpen()) {
 #if defined(HTML_INSTANT_EXTENDED_POPUP)
     InstantController* instant = GetInstantController();
     if (instant && instant->OnUpOrDownKeyPressed(count)) {
       // If Instant handles the key press, it's showing a list of suggestions
       // that it's stepping through. In that case, our popup model is
       // irrelevant, so don't process the key press ourselves. However, do stop
       // the autocomplete system from changing the results.
       autocomplete_controller()->Stop(false);
-    } else
+      return;
+    }
 #endif
-    {
-      // The popup is open, so the user should be able to interact with it
-      // normally.
-      popup_model()->Move(count);
-    }
+
+    // The popup is open, so the user should be able to interact with it
+    // normally.
+    popup_model()->Move(count);
+    return;
   }
+
+  if (!query_in_progress()) {
+    // The popup is neither open nor working on a query already.  So, start an
+    // autocomplete query for the current text.  This also sets
+    // user_input_in_progress_ to true, which we want: if the user has started
+    // to interact with the popup, changing the permanent_text_ shouldn't change
+    // the displayed text.
+    // Note: This does not force the popup to open immediately.
+    // TODO(pkasting): We should, in fact, force this particular query to open
+    // the popup immediately.
+    if (!user_input_in_progress_)
+      InternalSetUserText(permanent_text_);
+    view_->UpdatePopup();
+    return;
+  }
+
+  // TODO(pkasting): The popup is working on a query but is not open.  We should
+  // force it to open immediately.
 }
 
 void OmniboxEditModel::OnPopupDataChanged(
     const string16& text,
     GURL* destination_for_temporary_text_change,
     const string16& keyword,
     bool is_keyword_hint) {
   // The popup changed its data, the match in the controller is no longer valid.
   omnibox_controller_->InvalidateCurrentMatch();
 
@@ skipping 285 matching lines @@
       // used (to either navigate to the URL or let Instant commit its preview).
       // The match won't be used for logging, displaying in the dropdown, etc.
       // So, it's okay to pass in mostly bogus params (such as relevance = 0).
       // TODO(sreeram): Always using NO_SUGGESTIONS_AVAILABLE is wrong when
       // Instant is using the local fallback overlay. Fix.
       if (is_instant_temporary_text_a_search_query_) {
         const TemplateURL* default_provider =
             TemplateURLServiceFactory::GetForProfile(profile_)->
                 GetDefaultSearchProvider();
         if (default_provider && default_provider->SupportsReplacement()) {
-          *match = SearchProvider::CreateSearchSuggestion(profile_,
-              autocomplete_controller()->search_provider(), input, text, text,
-              0, AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED,
-              TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, false,
-              default_provider->keyword(),
+          *match = SearchProvider::CreateSearchSuggestion(
+              autocomplete_controller()->search_provider(), 0,
+              AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, default_provider,
+              text, text, input, false,
+              TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
               controller_->GetOmniboxBounds().x());
         } else {
           // Can't create a new search match. Leave |match| as is, with an
           // invalid destination_url. This shouldn't ever happen. For example,
           // even if a group policy update in the midst of interacting with
           // Instant leaves us without a valid search provider, Instant
           // should've observed the update and reset
           // |is_temporary_text_set_by_instant_|, so we still shouldn't get
           // here. However, as protection against the unknowns and Instant
           // regressions, we simply return an invalid match instead of crashing
@@ skipping 155 matching lines @@
     instant->OmniboxFocusChanged(state, reason, NULL);
 
   // 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();
 }