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

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

Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator. (Closed)
Patch Set: Fix merge Created 3 years, 6 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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/policy/profile_policy_connector_factory.h" 12 #include "chrome/browser/policy/profile_policy_connector_factory.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
15 #include "chrome/browser/profiles/profiles_state.h" 15 #include "chrome/browser/profiles/profiles_state.h"
16 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 16 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/test/base/in_process_browser_test.h" 19 #include "chrome/test/base/in_process_browser_test.h"
20 #include "components/network_session_configurator/common/network_switches.h"
20 #include "components/policy/core/browser/browser_policy_connector.h" 21 #include "components/policy/core/browser/browser_policy_connector.h"
21 #include "components/policy/core/common/mock_configuration_policy_provider.h" 22 #include "components/policy/core/common/mock_configuration_policy_provider.h"
22 #include "components/policy/core/common/policy_map.h" 23 #include "components/policy/core/common/policy_map.h"
23 #include "components/policy/core/common/policy_types.h" 24 #include "components/policy/core/common/policy_types.h"
24 #include "components/policy/policy_constants.h" 25 #include "components/policy/policy_constants.h"
25 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
26 #include "content/public/test/browser_test.h" 27 #include "content/public/test/browser_test.h"
27 #include "net/http/http_transaction_factory.h" 28 #include "net/http/http_transaction_factory.h"
28 #include "net/url_request/url_request_context.h" 29 #include "net/url_request/url_request_context.h"
29 #include "net/url_request/url_request_context_getter.h" 30 #include "net/url_request/url_request_context_getter.h"
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 407
407 // Disable QUIC in second profile 408 // Disable QUIC in second profile
408 SetQuicAllowedPolicy(policy_for_profile_2(), false); 409 SetQuicAllowedPolicy(policy_for_profile_2(), false);
409 EXPECT_FALSE(IsQuicEnabled(system_request_context())); 410 EXPECT_FALSE(IsQuicEnabled(system_request_context()));
410 EXPECT_FALSE(IsQuicEnabled(safe_browsing_service_request_context())); 411 EXPECT_FALSE(IsQuicEnabled(safe_browsing_service_request_context()));
411 EXPECT_FALSE(IsQuicEnabled(profile_1()->GetRequestContext())); 412 EXPECT_FALSE(IsQuicEnabled(profile_1()->GetRequestContext()));
412 EXPECT_FALSE(IsQuicEnabled(profile_2()->GetRequestContext())); 413 EXPECT_FALSE(IsQuicEnabled(profile_2()->GetRequestContext()));
413 } 414 }
414 415
415 } // namespace policy 416 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/payments/site_per_process_payments_browsertest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698