| 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.h" | 7 #include "chrome/browser/autocomplete/autocomplete_classifier.h" |
| 8 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 8 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
| 9 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 9 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
| 10 #include "chrome/browser/predictors/predictor_database.h" | 10 #include "chrome/browser/predictors/predictor_database.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 #if defined(OS_CHROMEOS) | 22 #if defined(OS_CHROMEOS) |
| 23 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 23 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| 24 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" | 24 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| 29 // Caller owns the returned service. | 29 // Caller owns the returned service. |
| 30 KeyedService* CreateTemplateURLService(content::BrowserContext* profile) { | 30 KeyedService* CreateTemplateURLService(content::BrowserContext* profile) { |
| 31 return new TemplateURLService(static_cast<Profile*>(profile), NULL); | 31 return new TemplateURLService(static_cast<Profile*>(profile), NULL, |
| 32 base::Closure()); |
| 32 } | 33 } |
| 33 | 34 |
| 34 KeyedService* CreateAutocompleteClassifier(content::BrowserContext* profile) { | 35 KeyedService* CreateAutocompleteClassifier(content::BrowserContext* profile) { |
| 35 return new AutocompleteClassifier( | 36 return new AutocompleteClassifier( |
| 36 make_scoped_ptr(new AutocompleteController( | 37 make_scoped_ptr(new AutocompleteController( |
| 37 static_cast<Profile*>(profile), NULL, | 38 static_cast<Profile*>(profile), NULL, |
| 38 AutocompleteClassifier::kDefaultOmniboxProviders)), | 39 AutocompleteClassifier::kDefaultOmniboxProviders)), |
| 39 scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier())); | 40 scoped_ptr<AutocompleteSchemeClassifier>(new TestSchemeClassifier())); |
| 40 } | 41 } |
| 41 | 42 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 AutocompleteClassifierFactory::GetInstance()->SetTestingFactory( | 102 AutocompleteClassifierFactory::GetInstance()->SetTestingFactory( |
| 102 profile, &CreateAutocompleteClassifier); | 103 profile, &CreateAutocompleteClassifier); |
| 103 return profile; | 104 return profile; |
| 104 } | 105 } |
| 105 | 106 |
| 106 BrowserWindow* TestWithBrowserView::CreateBrowserWindow() { | 107 BrowserWindow* TestWithBrowserView::CreateBrowserWindow() { |
| 107 // Allow BrowserWithTestWindowTest to use Browser to create the default | 108 // Allow BrowserWithTestWindowTest to use Browser to create the default |
| 108 // BrowserView and BrowserFrame. | 109 // BrowserView and BrowserFrame. |
| 109 return NULL; | 110 return NULL; |
| 110 } | 111 } |
| OLD | NEW |