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

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

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 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_tests_unit.gypi ('k') | extensions/browser/DEPS » ('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 #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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 #include "components/policy/core/common/policy_service_impl.h" 77 #include "components/policy/core/common/policy_service_impl.h"
78 #include "components/policy/core/common/schema.h" 78 #include "components/policy/core/common/schema.h"
79 #else 79 #else
80 #include "components/policy/core/common/policy_service_stub.h" 80 #include "components/policy/core/common/policy_service_stub.h"
81 #endif // defined(ENABLE_CONFIGURATION_POLICY) 81 #endif // defined(ENABLE_CONFIGURATION_POLICY)
82 82
83 #if defined(ENABLE_EXTENSIONS) 83 #if defined(ENABLE_EXTENSIONS)
84 #include "chrome/browser/extensions/extension_special_storage_policy.h" 84 #include "chrome/browser/extensions/extension_special_storage_policy.h"
85 #include "chrome/browser/extensions/extension_system_factory.h" 85 #include "chrome/browser/extensions/extension_system_factory.h"
86 #include "chrome/browser/extensions/test_extension_system.h" 86 #include "chrome/browser/extensions/test_extension_system.h"
87 #include "chrome/browser/guest_view/guest_view_manager.h"
88 #include "extensions/browser/extension_system.h" 87 #include "extensions/browser/extension_system.h"
88 #include "extensions/browser/guest_view/guest_view_manager.h"
89 #endif 89 #endif
90 90
91 #if defined(OS_ANDROID) 91 #if defined(OS_ANDROID)
92 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 92 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
93 #endif 93 #endif
94 94
95 #if defined(ENABLE_MANAGED_USERS) 95 #if defined(ENABLE_MANAGED_USERS)
96 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 96 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
97 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 97 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
98 #endif 98 #endif
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 extensions::ExtensionSystem::Get(this)->extension_service(); 813 extensions::ExtensionSystem::Get(this)->extension_service();
814 if (extension_service) 814 if (extension_service)
815 host_content_settings_map_->RegisterExtensionService(extension_service); 815 host_content_settings_map_->RegisterExtensionService(extension_service);
816 #endif 816 #endif
817 } 817 }
818 return host_content_settings_map_.get(); 818 return host_content_settings_map_.get();
819 } 819 }
820 820
821 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() { 821 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {
822 #if defined(ENABLE_EXTENSIONS) 822 #if defined(ENABLE_EXTENSIONS)
823 return GuestViewManager::FromBrowserContext(this); 823 return extensions::GuestViewManager::FromBrowserContext(this);
824 #else 824 #else
825 return NULL; 825 return NULL;
826 #endif 826 #endif
827 } 827 }
828 828
829 content::PushMessagingService* TestingProfile::GetPushMessagingService() { 829 content::PushMessagingService* TestingProfile::GetPushMessagingService() {
830 return NULL; 830 return NULL;
831 } 831 }
832 832
833 bool TestingProfile::IsSameProfile(Profile *p) { 833 bool TestingProfile::IsSameProfile(Profile *p) {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 #if defined(ENABLE_EXTENSIONS) 982 #if defined(ENABLE_EXTENSIONS)
983 extension_policy_, 983 extension_policy_,
984 #endif 984 #endif
985 pref_service_.Pass(), 985 pref_service_.Pass(),
986 incognito_, 986 incognito_,
987 guest_session_, 987 guest_session_,
988 supervised_user_id_, 988 supervised_user_id_,
989 policy_service_.Pass(), 989 policy_service_.Pass(),
990 testing_factories_)); 990 testing_factories_));
991 } 991 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | extensions/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698