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

Side by Side Diff: chrome/browser/io_thread_unittest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/io_thread.cc ('k') | chrome/browser/jumplist_win.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "base/prefs/pref_registry_simple.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/prefs/testing_pref_service.h"
14 #include "base/run_loop.h" 11 #include "base/run_loop.h"
15 #include "base/test/mock_entropy_provider.h" 12 #include "base/test/mock_entropy_provider.h"
16 #include "build/build_config.h" 13 #include "build/build_config.h"
17 #include "chrome/browser/io_thread.h" 14 #include "chrome/browser/io_thread.h"
18 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
19 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
20 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h" 17 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"
21 #include "components/policy/core/common/mock_policy_service.h" 18 #include "components/policy/core/common/mock_policy_service.h"
19 #include "components/prefs/pref_registry_simple.h"
20 #include "components/prefs/pref_service.h"
21 #include "components/prefs/testing_pref_service.h"
22 #include "components/proxy_config/pref_proxy_config_tracker_impl.h" 22 #include "components/proxy_config/pref_proxy_config_tracker_impl.h"
23 #include "components/proxy_config/proxy_config_pref_names.h" 23 #include "components/proxy_config/proxy_config_pref_names.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "content/public/test/test_browser_thread_bundle.h" 25 #include "content/public/test/test_browser_thread_bundle.h"
26 #include "net/cert_net/nss_ocsp.h" 26 #include "net/cert_net/nss_ocsp.h"
27 #include "net/http/http_auth_preferences.h" 27 #include "net/http/http_auth_preferences.h"
28 #include "net/http/http_auth_scheme.h" 28 #include "net/http/http_auth_scheme.h"
29 #include "net/http/http_network_session.h" 29 #include "net/http/http_network_session.h"
30 #include "net/http/http_server_properties_impl.h" 30 #include "net/http/http_server_properties_impl.h"
31 #include "net/quic/quic_protocol.h" 31 #include "net/quic/quic_protocol.h"
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType, 841 &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType,
842 base::Unretained(this), "acc1")); 842 base::Unretained(this), "acc1"));
843 pref_service()->SetString(prefs::kAuthAndroidNegotiateAccountType, "acc2"); 843 pref_service()->SetString(prefs::kAuthAndroidNegotiateAccountType, "acc2");
844 RunOnIOThreadBlocking(base::Bind( 844 RunOnIOThreadBlocking(base::Bind(
845 &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType, 845 &IOThreadTestWithIOThreadObject::CheckAuthAndroidNegoitateAccountType,
846 base::Unretained(this), "acc2")); 846 base::Unretained(this), "acc2"));
847 } 847 }
848 #endif 848 #endif
849 849
850 } // namespace test 850 } // namespace test
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698