Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1355)

Side by Side Diff: chrome/browser/extensions/api/omnibox/omnibox_apitest.cc

Issue 10909130: autocomplete: Add AutocompleteProvider::Type enum. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add !! for windows Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/format_macros.h" 5 #include "base/format_macros.h"
6 #include "base/string_util.h" 6 #include "base/string_util.h"
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/autocomplete/autocomplete_input.h" 9 #include "chrome/browser/autocomplete/autocomplete_input.h"
10 #include "chrome/browser/autocomplete/autocomplete_match.h" 10 #include "chrome/browser/autocomplete/autocomplete_match.h"
(...skipping 17 matching lines...) Expand all
28 #if defined(TOOLKIT_GTK) 28 #if defined(TOOLKIT_GTK)
29 #include "chrome/browser/ui/gtk/browser_window_gtk.h" 29 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
30 #endif 30 #endif
31 31
32 namespace { 32 namespace {
33 33
34 string16 AutocompleteResultAsString(const AutocompleteResult& result) { 34 string16 AutocompleteResultAsString(const AutocompleteResult& result) {
35 std::string output(base::StringPrintf("{%" PRIuS "} ", result.size())); 35 std::string output(base::StringPrintf("{%" PRIuS "} ", result.size()));
36 for (size_t i = 0; i < result.size(); ++i) { 36 for (size_t i = 0; i < result.size(); ++i) {
37 AutocompleteMatch match = result.match_at(i); 37 AutocompleteMatch match = result.match_at(i);
38 std::string provider_name = match.provider->name(); 38 std::string provider_name = match.provider->GetName();
39 output.append(base::StringPrintf("[\"%s\" by \"%s\"] ", 39 output.append(base::StringPrintf("[\"%s\" by \"%s\"] ",
40 UTF16ToUTF8(match.contents).c_str(), 40 UTF16ToUTF8(match.contents).c_str(),
41 provider_name.c_str())); 41 provider_name.c_str()));
42 } 42 }
43 return UTF8ToUTF16(output); 43 return UTF8ToUTF16(output);
44 } 44 }
45 45
46 } // namespace 46 } // namespace
47 47
48 class OmniboxApiTest : public ExtensionApiTest { 48 class OmniboxApiTest : public ExtensionApiTest {
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 // incognito context. 272 // incognito context.
273 { 273 {
274 ResultCatcher catcher; 274 ResultCatcher catcher;
275 autocomplete_controller->Start( 275 autocomplete_controller->Start(
276 ASCIIToUTF16("keyword command incognito"), string16(), 276 ASCIIToUTF16("keyword command incognito"), string16(),
277 true, false, true, AutocompleteInput::ALL_MATCHES); 277 true, false, true, AutocompleteInput::ALL_MATCHES);
278 location_bar->AcceptInput(); 278 location_bar->AcceptInput();
279 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 279 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
280 } 280 }
281 } 281 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/zero_suggest_provider.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698