Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 12335141: Move c/b/ui/search/search.* to c/b/instant/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/instant/search_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 15 matching lines...) Expand all
26 #include "chrome/browser/autocomplete/autocomplete_controller.h" 26 #include "chrome/browser/autocomplete/autocomplete_controller.h"
27 #include "chrome/browser/browser_process.h" 27 #include "chrome/browser/browser_process.h"
28 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 28 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
29 #include "chrome/browser/devtools/devtools_window.h" 29 #include "chrome/browser/devtools/devtools_window.h"
30 #include "chrome/browser/download/download_prefs.h" 30 #include "chrome/browser/download/download_prefs.h"
31 #include "chrome/browser/extensions/crx_installer.h" 31 #include "chrome/browser/extensions/crx_installer.h"
32 #include "chrome/browser/extensions/extension_service.h" 32 #include "chrome/browser/extensions/extension_service.h"
33 #include "chrome/browser/extensions/extension_system.h" 33 #include "chrome/browser/extensions/extension_system.h"
34 #include "chrome/browser/instant/instant_service.h" 34 #include "chrome/browser/instant/instant_service.h"
35 #include "chrome/browser/instant/instant_service_factory.h" 35 #include "chrome/browser/instant/instant_service_factory.h"
36 #include "chrome/browser/instant/search.h"
36 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 37 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
37 #include "chrome/browser/media/media_stream_devices_controller.h" 38 #include "chrome/browser/media/media_stream_devices_controller.h"
38 #include "chrome/browser/net/url_request_mock_util.h" 39 #include "chrome/browser/net/url_request_mock_util.h"
39 #include "chrome/browser/plugins/plugin_prefs.h" 40 #include "chrome/browser/plugins/plugin_prefs.h"
40 #include "chrome/browser/policy/browser_policy_connector.h" 41 #include "chrome/browser/policy/browser_policy_connector.h"
41 #include "chrome/browser/policy/mock_configuration_policy_provider.h" 42 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
42 #include "chrome/browser/policy/policy_map.h" 43 #include "chrome/browser/policy/policy_map.h"
43 #include "chrome/browser/prefs/session_startup_pref.h" 44 #include "chrome/browser/prefs/session_startup_pref.h"
44 #include "chrome/browser/profiles/profile.h" 45 #include "chrome/browser/profiles/profile.h"
45 #include "chrome/browser/search_engines/template_url.h" 46 #include "chrome/browser/search_engines/template_url.h"
46 #include "chrome/browser/search_engines/template_url_service.h" 47 #include "chrome/browser/search_engines/template_url_service.h"
47 #include "chrome/browser/search_engines/template_url_service_factory.h" 48 #include "chrome/browser/search_engines/template_url_service_factory.h"
48 #include "chrome/browser/translate/translate_infobar_delegate.h" 49 #include "chrome/browser/translate/translate_infobar_delegate.h"
49 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 50 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
50 #include "chrome/browser/ui/browser.h" 51 #include "chrome/browser/ui/browser.h"
51 #include "chrome/browser/ui/browser_commands.h" 52 #include "chrome/browser/ui/browser_commands.h"
52 #include "chrome/browser/ui/browser_list.h" 53 #include "chrome/browser/ui/browser_list.h"
53 #include "chrome/browser/ui/browser_tabstrip.h" 54 #include "chrome/browser/ui/browser_tabstrip.h"
54 #include "chrome/browser/ui/browser_window.h" 55 #include "chrome/browser/ui/browser_window.h"
55 #include "chrome/browser/ui/host_desktop.h" 56 #include "chrome/browser/ui/host_desktop.h"
56 #include "chrome/browser/ui/omnibox/location_bar.h" 57 #include "chrome/browser/ui/omnibox/location_bar.h"
57 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" 58 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
58 #include "chrome/browser/ui/omnibox/omnibox_view.h" 59 #include "chrome/browser/ui/omnibox/omnibox_view.h"
59 #include "chrome/browser/ui/search/search.h"
60 #include "chrome/browser/ui/tabs/tab_strip_model.h" 60 #include "chrome/browser/ui/tabs/tab_strip_model.h"
61 #include "chrome/common/chrome_notification_types.h" 61 #include "chrome/common/chrome_notification_types.h"
62 #include "chrome/common/chrome_paths.h" 62 #include "chrome/common/chrome_paths.h"
63 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
64 #include "chrome/common/content_settings.h" 64 #include "chrome/common/content_settings.h"
65 #include "chrome/common/extensions/extension.h" 65 #include "chrome/common/extensions/extension.h"
66 #include "chrome/common/extensions/extension_constants.h" 66 #include "chrome/common/extensions/extension_constants.h"
67 #include "chrome/common/pref_names.h" 67 #include "chrome/common/pref_names.h"
68 #include "chrome/common/url_constants.h" 68 #include "chrome/common/url_constants.h"
69 #include "chrome/test/base/in_process_browser_test.h" 69 #include "chrome/test/base/in_process_browser_test.h"
(...skipping 1874 matching lines...) Expand 10 before | Expand all | Expand 10 after
1944 this)); 1944 this));
1945 1945
1946 MessageLoop::current()->Run(); 1946 MessageLoop::current()->Run();
1947 } 1947 }
1948 1948
1949 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance, 1949 INSTANTIATE_TEST_CASE_P(MediaStreamDevicesControllerBrowserTestInstance,
1950 MediaStreamDevicesControllerBrowserTest, 1950 MediaStreamDevicesControllerBrowserTest,
1951 testing::Bool()); 1951 testing::Bool());
1952 1952
1953 } // namespace policy 1953 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/instant/search_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698