| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/views/frame/test_with_browser_view.h" | 5 #include "chrome/browser/ui/views/frame/test_with_browser_view.h" |
| 6 | 6 |
| 7 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 7 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
| 8 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" | 8 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" |
| 9 #include "chrome/browser/history/history_service_factory.h" | 9 #include "chrome/browser/history/history_service_factory.h" |
| 10 #include "chrome/browser/predictors/predictor_database.h" | 10 #include "chrome/browser/predictors/predictor_database.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 | 55 |
| 56 nullptr, AutocompleteClassifier::kDefaultOmniboxProviders)), | 56 nullptr, AutocompleteClassifier::kDefaultOmniboxProviders)), |
| 57 scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier()))); | 57 scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier()))); |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace | 60 } // namespace |
| 61 | 61 |
| 62 TestWithBrowserView::TestWithBrowserView() { | 62 TestWithBrowserView::TestWithBrowserView() { |
| 63 } | 63 } |
| 64 | 64 |
| 65 TestWithBrowserView::TestWithBrowserView( | 65 TestWithBrowserView::TestWithBrowserView(Browser::Type browser_type, |
| 66 Browser::Type browser_type, | 66 ui::HostDesktopType host_desktop_type, |
| 67 chrome::HostDesktopType host_desktop_type, | 67 bool hosted_app) |
| 68 bool hosted_app) | 68 : BrowserWithTestWindowTest(browser_type, host_desktop_type, hosted_app) {} |
| 69 : BrowserWithTestWindowTest(browser_type, | |
| 70 host_desktop_type, | |
| 71 hosted_app) { | |
| 72 } | |
| 73 | 69 |
| 74 TestWithBrowserView::~TestWithBrowserView() { | 70 TestWithBrowserView::~TestWithBrowserView() { |
| 75 } | 71 } |
| 76 | 72 |
| 77 void TestWithBrowserView::SetUp() { | 73 void TestWithBrowserView::SetUp() { |
| 78 local_state_.reset( | 74 local_state_.reset( |
| 79 new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal())); | 75 new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal())); |
| 80 #if defined(OS_CHROMEOS) | 76 #if defined(OS_CHROMEOS) |
| 81 chromeos::input_method::InitializeForTesting( | 77 chromeos::input_method::InitializeForTesting( |
| 82 new chromeos::input_method::MockInputMethodManager); | 78 new chromeos::input_method::MockInputMethodManager); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 AutocompleteClassifierFactory::GetInstance()->SetTestingFactory( | 115 AutocompleteClassifierFactory::GetInstance()->SetTestingFactory( |
| 120 profile, &CreateAutocompleteClassifier); | 116 profile, &CreateAutocompleteClassifier); |
| 121 return profile; | 117 return profile; |
| 122 } | 118 } |
| 123 | 119 |
| 124 BrowserWindow* TestWithBrowserView::CreateBrowserWindow() { | 120 BrowserWindow* TestWithBrowserView::CreateBrowserWindow() { |
| 125 // Allow BrowserWithTestWindowTest to use Browser to create the default | 121 // Allow BrowserWithTestWindowTest to use Browser to create the default |
| 126 // BrowserView and BrowserFrame. | 122 // BrowserView and BrowserFrame. |
| 127 return nullptr; | 123 return nullptr; |
| 128 } | 124 } |
| OLD | NEW |