Omnibox: Trim Leading Spaces After Initial Forced-Query '?'

chrome/browser/autocomplete/autocomplete_input.cc

Index: chrome/browser/autocomplete/autocomplete_input.cc
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc
index ae0d4bc0e45c045df4850bbae095835f55960990..119758e1cd977c532c7460c1ff6c8fccc7bf8569 100644
--- a/chrome/browser/autocomplete/autocomplete_input.cc
+++ b/chrome/browser/autocomplete/autocomplete_input.cc
@@ -72,6 +72,16 @@ AutocompleteInput::AutocompleteInput(const string16& text,
 
   size_t chars_removed = RemoveForcedQueryStringIfNecessary(type_, &text_);
   AdjustCursorPositionIfNecessary(chars_removed, &cursor_position_);
+  if (chars_removed) {
+    // Remove spaces between opening question mark and first actual character.
+    string16 trimmed_text;
+    if ((TrimWhitespace(text_, TRIM_LEADING, &trimmed_text) & TRIM_LEADING) !=
+        0) {
+      AdjustCursorPositionIfNecessary(text_.length() - trimmed_text.length(),
+                                      &cursor_position_);
+      text_ = trimmed_text;
+    }
+  }
 }
 
 AutocompleteInput::~AutocompleteInput() {