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

Side by Side Diff: chrome/test/base/testing_profile.h

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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/chrome_browser.gypi ('k') | chrome/test/base/testing_profile.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 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_ 5 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_ 6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 net::URLRequestContextGetter* GetRequestContextForExtensions() override; 275 net::URLRequestContextGetter* GetRequestContextForExtensions() override;
276 net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( 276 net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(
277 const base::FilePath& partition_path, 277 const base::FilePath& partition_path,
278 bool in_memory) override; 278 bool in_memory) override;
279 net::URLRequestContextGetter* CreateRequestContextForStoragePartition( 279 net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
280 const base::FilePath& partition_path, 280 const base::FilePath& partition_path,
281 bool in_memory, 281 bool in_memory,
282 content::ProtocolHandlerMap* protocol_handlers, 282 content::ProtocolHandlerMap* protocol_handlers,
283 content::URLRequestInterceptorScopedVector request_interceptors) override; 283 content::URLRequestInterceptorScopedVector request_interceptors) override;
284 net::SSLConfigService* GetSSLConfigService() override; 284 net::SSLConfigService* GetSSLConfigService() override;
285 HostContentSettingsMap* GetHostContentSettingsMap() override;
286 void set_last_session_exited_cleanly(bool value) { 285 void set_last_session_exited_cleanly(bool value) {
287 last_session_exited_cleanly_ = value; 286 last_session_exited_cleanly_ = value;
288 } 287 }
289 bool IsSameProfile(Profile* p) override; 288 bool IsSameProfile(Profile* p) override;
290 base::Time GetStartTime() const override; 289 base::Time GetStartTime() const override;
291 base::FilePath last_selected_directory() override; 290 base::FilePath last_selected_directory() override;
292 void set_last_selected_directory(const base::FilePath& path) override; 291 void set_last_selected_directory(const base::FilePath& path) override;
293 bool WasCreatedByVersionOrLater(const std::string& version) override; 292 bool WasCreatedByVersionOrLater(const std::string& version) override;
294 bool IsGuestSession() const override; 293 bool IsGuestSession() const override;
295 void SetExitType(ExitType exit_type) override {} 294 void SetExitType(ExitType exit_type) override {}
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 399
401 // Weak pointer to a delegate for indicating that a profile was created. 400 // Weak pointer to a delegate for indicating that a profile was created.
402 Delegate* delegate_; 401 Delegate* delegate_;
403 402
404 std::string profile_name_; 403 std::string profile_name_;
405 404
406 scoped_ptr<policy::PolicyService> policy_service_; 405 scoped_ptr<policy::PolicyService> policy_service_;
407 }; 406 };
408 407
409 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 408 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698