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

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

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Android compile, remove unused variable. Created 6 years, 1 month 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 | Annotate | Revision Log
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 "chrome/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 } 627 }
628 628
629 void TestingProfile::SetGuestSession(bool guest) { 629 void TestingProfile::SetGuestSession(bool guest) {
630 guest_session_ = guest; 630 guest_session_ = guest;
631 } 631 }
632 632
633 base::FilePath TestingProfile::GetPath() const { 633 base::FilePath TestingProfile::GetPath() const {
634 return profile_path_; 634 return profile_path_;
635 } 635 }
636 636
637 scoped_ptr<content::ZoomLevelDelegate> TestingProfile::CreateZoomLevelDelegate(
638 const base::FilePath& partition_path) {
639 return scoped_ptr<content::ZoomLevelDelegate>();
sky 2014/11/11 20:21:56 nullptr
wjmaclean 2014/11/11 20:59:09 Done.
640 }
641
637 scoped_refptr<base::SequencedTaskRunner> TestingProfile::GetIOTaskRunner() { 642 scoped_refptr<base::SequencedTaskRunner> TestingProfile::GetIOTaskRunner() {
638 return base::MessageLoop::current()->message_loop_proxy(); 643 return base::MessageLoop::current()->message_loop_proxy();
639 } 644 }
640 645
641 TestingPrefServiceSyncable* TestingProfile::GetTestingPrefService() { 646 TestingPrefServiceSyncable* TestingProfile::GetTestingPrefService() {
642 DCHECK(prefs_); 647 DCHECK(prefs_);
643 DCHECK(testing_prefs_); 648 DCHECK(testing_prefs_);
644 return testing_prefs_; 649 return testing_prefs_;
645 } 650 }
646 651
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 #if defined(ENABLE_EXTENSIONS) 1039 #if defined(ENABLE_EXTENSIONS)
1035 extension_policy_, 1040 extension_policy_,
1036 #endif 1041 #endif
1037 pref_service_.Pass(), 1042 pref_service_.Pass(),
1038 original_profile, 1043 original_profile,
1039 guest_session_, 1044 guest_session_,
1040 supervised_user_id_, 1045 supervised_user_id_,
1041 policy_service_.Pass(), 1046 policy_service_.Pass(),
1042 testing_factories_); 1047 testing_factories_);
1043 } 1048 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698