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

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

Issue 2137463003: [Extensions] Move Feature channel code into //extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 4 years, 5 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
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "chrome/browser/ui/browser.h" 80 #include "chrome/browser/ui/browser.h"
81 #include "chrome/browser/ui/browser_commands.h" 81 #include "chrome/browser/ui/browser_commands.h"
82 #include "chrome/browser/ui/browser_list.h" 82 #include "chrome/browser/ui/browser_list.h"
83 #include "chrome/browser/ui/browser_tabstrip.h" 83 #include "chrome/browser/ui/browser_tabstrip.h"
84 #include "chrome/browser/ui/browser_window.h" 84 #include "chrome/browser/ui/browser_window.h"
85 #include "chrome/browser/ui/location_bar/location_bar.h" 85 #include "chrome/browser/ui/location_bar/location_bar.h"
86 #include "chrome/browser/ui/tabs/tab_strip_model.h" 86 #include "chrome/browser/ui/tabs/tab_strip_model.h"
87 #include "chrome/common/chrome_paths.h" 87 #include "chrome/common/chrome_paths.h"
88 #include "chrome/common/chrome_switches.h" 88 #include "chrome/common/chrome_switches.h"
89 #include "chrome/common/extensions/extension_constants.h" 89 #include "chrome/common/extensions/extension_constants.h"
90 #include "chrome/common/extensions/features/feature_channel.h"
91 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
92 #include "chrome/common/url_constants.h" 91 #include "chrome/common/url_constants.h"
93 #include "chrome/grit/generated_resources.h" 92 #include "chrome/grit/generated_resources.h"
94 #include "chrome/test/base/in_process_browser_test.h" 93 #include "chrome/test/base/in_process_browser_test.h"
95 #include "chrome/test/base/search_test_utils.h" 94 #include "chrome/test/base/search_test_utils.h"
96 #include "chrome/test/base/ui_test_utils.h" 95 #include "chrome/test/base/ui_test_utils.h"
97 #include "components/bookmarks/common/bookmark_pref_names.h" 96 #include "components/bookmarks/common/bookmark_pref_names.h"
98 #include "components/content_settings/core/common/content_settings.h" 97 #include "components/content_settings/core/common/content_settings.h"
99 #include "components/content_settings/core/common/content_settings_pattern.h" 98 #include "components/content_settings/core/common/content_settings_pattern.h"
100 #include "components/content_settings/core/common/pref_names.h" 99 #include "components/content_settings/core/common/pref_names.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 #include "extensions/browser/extension_prefs.h" 158 #include "extensions/browser/extension_prefs.h"
160 #include "extensions/browser/extension_registry.h" 159 #include "extensions/browser/extension_registry.h"
161 #include "extensions/browser/extension_system.h" 160 #include "extensions/browser/extension_system.h"
162 #include "extensions/browser/process_manager.h" 161 #include "extensions/browser/process_manager.h"
163 #include "extensions/browser/scoped_ignore_content_verifier_for_test.h" 162 #include "extensions/browser/scoped_ignore_content_verifier_for_test.h"
164 #include "extensions/browser/test_extension_registry_observer.h" 163 #include "extensions/browser/test_extension_registry_observer.h"
165 #include "extensions/browser/uninstall_reason.h" 164 #include "extensions/browser/uninstall_reason.h"
166 #include "extensions/common/constants.h" 165 #include "extensions/common/constants.h"
167 #include "extensions/common/extension.h" 166 #include "extensions/common/extension.h"
168 #include "extensions/common/extension_set.h" 167 #include "extensions/common/extension_set.h"
168 #include "extensions/common/features/feature_channel.h"
169 #include "extensions/common/manifest_handlers/shared_module_info.h" 169 #include "extensions/common/manifest_handlers/shared_module_info.h"
170 #include "net/base/net_errors.h" 170 #include "net/base/net_errors.h"
171 #include "net/base/url_util.h" 171 #include "net/base/url_util.h"
172 #include "net/http/http_stream_factory.h" 172 #include "net/http/http_stream_factory.h"
173 #include "net/http/transport_security_state.h" 173 #include "net/http/transport_security_state.h"
174 #include "net/test/embedded_test_server/embedded_test_server.h" 174 #include "net/test/embedded_test_server/embedded_test_server.h"
175 #include "net/test/url_request/url_request_failed_job.h" 175 #include "net/test/url_request/url_request_failed_job.h"
176 #include "net/test/url_request/url_request_mock_http_job.h" 176 #include "net/test/url_request/url_request_mock_http_job.h"
177 #include "net/url_request/url_request.h" 177 #include "net/url_request/url_request.h"
178 #include "net/url_request/url_request_filter.h" 178 #include "net/url_request/url_request_filter.h"
(...skipping 3928 matching lines...) Expand 10 before | Expand all | Expand 10 after
4107 4107
4108 SetEmptyPolicy(); 4108 SetEmptyPolicy();
4109 // Policy not set. 4109 // Policy not set.
4110 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); 4110 CheckSystemTimezoneAutomaticDetectionPolicyUnset();
4111 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); 4111 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
4112 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); 4112 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
4113 } 4113 }
4114 #endif // defined(OS_CHROMEOS) 4114 #endif // defined(OS_CHROMEOS)
4115 4115
4116 } // namespace policy 4116 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698