Chromium Code Reviews| 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 | 
| 
 
Nico
2015/06/23 16:57:07
The test should probably move to components too? I
 
blundell
2015/06/24 05:37:54
Indeed. I always componentize in two stages: first
 
 | |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "components/omnibox/autocomplete_provider.h" | 5 #include "components/omnibox/autocomplete_provider.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" | 
| 9 #include "base/location.h" | 9 #include "base/location.h" | 
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" | 
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" | 
| 12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" | 
| 13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" | 
| 14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" | 
| 15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" | 
| 16 #include "base/thread_task_runner_handle.h" | 16 #include "base/thread_task_runner_handle.h" | 
| 17 #include "chrome/browser/autocomplete/autocomplete_controller.h" | |
| 18 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" | 17 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" | 
| 19 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 
| 20 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" | 
| 21 #include "chrome/browser/search_engines/template_url_service_factory.h" | 20 #include "chrome/browser/search_engines/template_url_service_factory.h" | 
| 22 #include "chrome/test/base/testing_browser_process.h" | 21 #include "chrome/test/base/testing_browser_process.h" | 
| 23 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" | 
| 24 #include "components/metrics/proto/omnibox_event.pb.h" | 23 #include "components/metrics/proto/omnibox_event.pb.h" | 
| 24 #include "components/omnibox/autocomplete_controller.h" | |
| 25 #include "components/omnibox/autocomplete_input.h" | 25 #include "components/omnibox/autocomplete_input.h" | 
| 26 #include "components/omnibox/autocomplete_match.h" | 26 #include "components/omnibox/autocomplete_match.h" | 
| 27 #include "components/omnibox/autocomplete_provider_listener.h" | 27 #include "components/omnibox/autocomplete_provider_listener.h" | 
| 28 #include "components/omnibox/keyword_provider.h" | 28 #include "components/omnibox/keyword_provider.h" | 
| 29 #include "components/omnibox/search_provider.h" | 29 #include "components/omnibox/search_provider.h" | 
| 30 #include "components/search_engines/search_engines_switches.h" | 30 #include "components/search_engines/search_engines_switches.h" | 
| 31 #include "components/search_engines/template_url.h" | 31 #include "components/search_engines/template_url.h" | 
| 32 #include "components/search_engines/template_url_service.h" | 32 #include "components/search_engines/template_url_service.h" | 
| 33 #include "content/public/browser/notification_observer.h" | 33 #include "content/public/browser/notification_observer.h" | 
| 34 #include "content/public/browser/notification_registrar.h" | 34 #include "content/public/browser/notification_registrar.h" | 
| (...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 747 EXPECT_FALSE(search_provider_field_trial_triggered_in_session()); | 747 EXPECT_FALSE(search_provider_field_trial_triggered_in_session()); | 
| 748 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); | 748 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); | 
| 749 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path()); | 749 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path()); | 
| 750 | 750 | 
| 751 // Test page classification and field trial triggered set. | 751 // Test page classification and field trial triggered set. | 
| 752 set_search_provider_field_trial_triggered_in_session(true); | 752 set_search_provider_field_trial_triggered_in_session(true); | 
| 753 EXPECT_TRUE(search_provider_field_trial_triggered_in_session()); | 753 EXPECT_TRUE(search_provider_field_trial_triggered_in_session()); | 
| 754 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); | 754 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); | 
| 755 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path()); | 755 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path()); | 
| 756 } | 756 } | 
| OLD | NEW |