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 "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/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
638 } | 638 } |
639 | 639 |
640 Profile* TestingProfile::GetOffTheRecordProfile() { | 640 Profile* TestingProfile::GetOffTheRecordProfile() { |
641 if (IsOffTheRecord()) | 641 if (IsOffTheRecord()) |
642 return this; | 642 return this; |
643 if (!incognito_profile_) { | 643 if (!incognito_profile_) { |
644 TestingProfile::Builder builder; | 644 TestingProfile::Builder builder; |
645 builder.SetIncognito(); | 645 builder.SetIncognito(); |
646 scoped_ptr<TestingProfile> incognito_test_profile(builder.Build()); | 646 scoped_ptr<TestingProfile> incognito_test_profile(builder.Build()); |
647 incognito_test_profile->SetOriginalProfile(this); | 647 incognito_test_profile->SetOriginalProfile(this); |
| 648 incognito_test_profile->TrackZoomLevelsFromParent(this); |
648 SetOffTheRecordProfile(incognito_test_profile.PassAs<Profile>()); | 649 SetOffTheRecordProfile(incognito_test_profile.PassAs<Profile>()); |
649 } | 650 } |
650 return incognito_profile_.get(); | 651 return incognito_profile_.get(); |
651 } | 652 } |
652 | 653 |
653 bool TestingProfile::HasOffTheRecordProfile() { | 654 bool TestingProfile::HasOffTheRecordProfile() { |
654 return incognito_profile_.get() != NULL; | 655 return incognito_profile_.get() != NULL; |
655 } | 656 } |
656 | 657 |
657 Profile* TestingProfile::GetOriginalProfile() { | 658 Profile* TestingProfile::GetOriginalProfile() { |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
982 #if defined(ENABLE_EXTENSIONS) | 983 #if defined(ENABLE_EXTENSIONS) |
983 extension_policy_, | 984 extension_policy_, |
984 #endif | 985 #endif |
985 pref_service_.Pass(), | 986 pref_service_.Pass(), |
986 incognito_, | 987 incognito_, |
987 guest_session_, | 988 guest_session_, |
988 supervised_user_id_, | 989 supervised_user_id_, |
989 policy_service_.Pass(), | 990 policy_service_.Pass(), |
990 testing_factories_)); | 991 testing_factories_)); |
991 } | 992 } |
OLD | NEW |