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 |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/base/testing_profile.h" | 5 #include "chrome/test/base/testing_profile.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 private: | 118 private: |
119 virtual ~QuittingHistoryDBTask() {} | 119 virtual ~QuittingHistoryDBTask() {} |
120 | 120 |
121 DISALLOW_COPY_AND_ASSIGN(QuittingHistoryDBTask); | 121 DISALLOW_COPY_AND_ASSIGN(QuittingHistoryDBTask); |
122 }; | 122 }; |
123 | 123 |
124 class TestExtensionURLRequestContext : public net::URLRequestContext { | 124 class TestExtensionURLRequestContext : public net::URLRequestContext { |
125 public: | 125 public: |
126 TestExtensionURLRequestContext() { | 126 TestExtensionURLRequestContext() { |
127 net::CookieMonster* cookie_monster = | 127 net::CookieMonster* cookie_monster = |
128 content::CreateInMemoryCookieStore(NULL)->GetCookieMonster(); | 128 content::CreateCookieStore(content::CookieStoreConfig())-> |
| 129 GetCookieMonster(); |
129 const char* schemes[] = {extensions::kExtensionScheme}; | 130 const char* schemes[] = {extensions::kExtensionScheme}; |
130 cookie_monster->SetCookieableSchemes(schemes, 1); | 131 cookie_monster->SetCookieableSchemes(schemes, 1); |
131 set_cookie_store(cookie_monster); | 132 set_cookie_store(cookie_monster); |
132 } | 133 } |
133 | 134 |
134 virtual ~TestExtensionURLRequestContext() {} | 135 virtual ~TestExtensionURLRequestContext() {} |
135 }; | 136 }; |
136 | 137 |
137 class TestExtensionURLRequestContextGetter | 138 class TestExtensionURLRequestContextGetter |
138 : public net::URLRequestContextGetter { | 139 : public net::URLRequestContextGetter { |
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
945 path_, | 946 path_, |
946 delegate_, | 947 delegate_, |
947 extension_policy_, | 948 extension_policy_, |
948 pref_service_.Pass(), | 949 pref_service_.Pass(), |
949 incognito_, | 950 incognito_, |
950 guest_session_, | 951 guest_session_, |
951 managed_user_id_, | 952 managed_user_id_, |
952 policy_service_.Pass(), | 953 policy_service_.Pass(), |
953 testing_factories_)); | 954 testing_factories_)); |
954 } | 955 } |
OLD | NEW |