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

Side by Side Diff: chrome/browser/extensions/extension_omnibox_apitest.cc

Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes. Created 10 years, 1 month 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/string_util.h" 5 #include "base/string_util.h"
6 #include "base/stringprintf.h" 6 #include "base/stringprintf.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/autocomplete/autocomplete.h" 8 #include "chrome/browser/autocomplete/autocomplete.h"
9 #include "chrome/browser/autocomplete/autocomplete_edit.h" 9 #include "chrome/browser/autocomplete/autocomplete_edit.h"
10 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" 10 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
11 #include "chrome/browser/autocomplete/autocomplete_match.h" 11 #include "chrome/browser/autocomplete/autocomplete_match.h"
12 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" 12 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
13 #include "chrome/browser/browser.h"
14 #include "chrome/browser/browser_window.h" 13 #include "chrome/browser/browser_window.h"
15 #include "chrome/browser/extensions/extension_apitest.h" 14 #include "chrome/browser/extensions/extension_apitest.h"
16 #include "chrome/browser/location_bar.h" 15 #include "chrome/browser/location_bar.h"
17 #include "chrome/browser/profile.h" 16 #include "chrome/browser/profile.h"
18 #include "chrome/browser/search_engines/template_url.h" 17 #include "chrome/browser/search_engines/template_url.h"
19 #include "chrome/browser/search_engines/template_url_model.h" 18 #include "chrome/browser/search_engines/template_url_model.h"
19 #include "chrome/browser/ui/browser.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/notification_type.h" 21 #include "chrome/common/notification_type.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "chrome/test/ui_test_utils.h" 23 #include "chrome/test/ui_test_utils.h"
24 24
25 // Basic test is flaky on ChromeOS. 25 // Basic test is flaky on ChromeOS.
26 // http://crbug.com/52929 26 // http://crbug.com/52929
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
28 #define MAYBE_Basic FLAKY_Basic 28 #define MAYBE_Basic FLAKY_Basic
29 #else 29 #else
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 } 165 }
166 166
167 { 167 {
168 ResultCatcher catcher; 168 ResultCatcher catcher;
169 autocomplete_controller->Start(L"keyword command", std::wstring(), 169 autocomplete_controller->Start(L"keyword command", std::wstring(),
170 true, false, true, false); 170 true, false, true, false);
171 location_bar->AcceptInput(); 171 location_bar->AcceptInput();
172 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 172 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
173 } 173 }
174 } 174 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_management_browsertest.cc ('k') | chrome/browser/extensions/extension_override_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698