OLD | NEW |
---|---|
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 | 45 |
46 } // namespace | 46 } // namespace |
47 | 47 |
48 class OmniboxApiTest : public ExtensionApiTest { | 48 class OmniboxApiTest : public ExtensionApiTest { |
49 protected: | 49 protected: |
50 LocationBar* GetLocationBar(Browser* browser) const { | 50 LocationBar* GetLocationBar(Browser* browser) const { |
51 return browser->window()->GetLocationBar(); | 51 return browser->window()->GetLocationBar(); |
52 } | 52 } |
53 | 53 |
54 AutocompleteController* GetAutocompleteController(Browser* browser) const { | 54 AutocompleteController* GetAutocompleteController(Browser* browser) const { |
55 return GetLocationBar(browser)->GetLocationEntry()->model()->popup_model()-> | 55 return GetLocationBar(browser)->GetLocationEntry()->model()-> |
56 autocomplete_controller(); | 56 popup_model()->autocomplete_controller(); |
Peter Kasting
2012/07/26 23:03:24
Nit: This change doesn't really improve things, I'
dominich
2012/07/27 20:33:54
hangover from model->GetModel->model rename.
| |
57 } | 57 } |
58 | 58 |
59 // TODO(phajdan.jr): Get rid of this wait-in-a-loop pattern. | 59 // TODO(phajdan.jr): Get rid of this wait-in-a-loop pattern. |
60 void WaitForAutocompleteDone(AutocompleteController* controller) { | 60 void WaitForAutocompleteDone(AutocompleteController* controller) { |
61 while (!controller->done()) { | 61 while (!controller->done()) { |
62 content::WindowedNotificationObserver ready_observer( | 62 content::WindowedNotificationObserver ready_observer( |
63 chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY, | 63 chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY, |
64 content::Source<AutocompleteController>(controller)); | 64 content::Source<AutocompleteController>(controller)); |
65 ready_observer.Wait(); | 65 ready_observer.Wait(); |
66 } | 66 } |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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 } |
OLD | NEW |