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