Omnibox refactor. OmniboxController now holds an AutocompleteMatch.

chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc

 // Copyright (c) 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 "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
@@ skipping 142 matching lines @@
   ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
   ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
   LocationBar* location_bar = GetLocationBar(browser());
   OmniboxView* omnibox_view = location_bar->GetLocationEntry();
   ResultCatcher catcher;
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
   omnibox_view->OnBeforePossibleChange();
-  omnibox_view->SetUserText(string16());
+  omnibox_view->SetUserText(ASCIIToUTF16("keyword command"));
   omnibox_view->OnAfterPossibleChange();
 
   autocomplete_controller->Start(
       AutocompleteInput(ASCIIToUTF16("keyword command"), string16::npos,
                         string16(), GURL(), true, false, true,
                         AutocompleteInput::ALL_MATCHES));
   location_bar->GetLocationEntry()->model()->AcceptInput(
       CURRENT_TAB,
       false); // Not for drop operation.
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 
   omnibox_view->OnBeforePossibleChange();
-  omnibox_view->SetUserText(string16());
+  omnibox_view->SetUserText(ASCIIToUTF16("keyword newtab"));
   omnibox_view->OnAfterPossibleChange();
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
 
   autocomplete_controller->Start(
       AutocompleteInput(ASCIIToUTF16("keyword newtab"), string16::npos,
                         string16(), GURL(), true, false, true,
                         AutocompleteInput::ALL_MATCHES));
   location_bar->GetLocationEntry()->model()->AcceptInput(
       NEW_FOREGROUND_TAB,
@@ skipping 53 matching lines @@
   {
     ResultCatcher catcher;
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keyword command incognito"),
                           string16::npos, string16(), GURL(), true, false, true,
                           AutocompleteInput::ALL_MATCHES));
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }