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

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

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test change to build Created 5 years, 7 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
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #include "components/policy/core/common/schema.h" 96 #include "components/policy/core/common/schema.h"
97 #else 97 #else
98 #include "components/policy/core/common/policy_service_stub.h" 98 #include "components/policy/core/common/policy_service_stub.h"
99 #endif // defined(ENABLE_CONFIGURATION_POLICY) 99 #endif // defined(ENABLE_CONFIGURATION_POLICY)
100 100
101 #if defined(ENABLE_EXTENSIONS) 101 #if defined(ENABLE_EXTENSIONS)
102 #include "chrome/browser/extensions/extension_service.h" 102 #include "chrome/browser/extensions/extension_service.h"
103 #include "chrome/browser/extensions/extension_special_storage_policy.h" 103 #include "chrome/browser/extensions/extension_special_storage_policy.h"
104 #include "chrome/browser/extensions/extension_system_factory.h" 104 #include "chrome/browser/extensions/extension_system_factory.h"
105 #include "chrome/browser/extensions/test_extension_system.h" 105 #include "chrome/browser/extensions/test_extension_system.h"
106 #include "components/guest_view/browser/guest_view_manager.h"
106 #include "extensions/browser/extension_system.h" 107 #include "extensions/browser/extension_system.h"
107 #include "extensions/browser/guest_view/guest_view_manager.h"
108 #endif 108 #endif
109 109
110 #if defined(OS_ANDROID) 110 #if defined(OS_ANDROID)
111 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 111 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
112 #endif 112 #endif
113 113
114 #if defined(ENABLE_SUPERVISED_USERS) 114 #if defined(ENABLE_SUPERVISED_USERS)
115 #include "chrome/browser/supervised_user/supervised_user_constants.h" 115 #include "chrome/browser/supervised_user/supervised_user_constants.h"
116 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 116 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
117 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 117 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 extension_service->RegisterContentSettings( 948 extension_service->RegisterContentSettings(
949 host_content_settings_map_.get()); 949 host_content_settings_map_.get());
950 } 950 }
951 #endif 951 #endif
952 } 952 }
953 return host_content_settings_map_.get(); 953 return host_content_settings_map_.get();
954 } 954 }
955 955
956 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() { 956 content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {
957 #if defined(ENABLE_EXTENSIONS) 957 #if defined(ENABLE_EXTENSIONS)
958 return extensions::GuestViewManager::FromBrowserContext(this); 958 return guestview::GuestViewManager::FromBrowserContext(this);
959 #else 959 #else
960 return NULL; 960 return NULL;
961 #endif 961 #endif
962 } 962 }
963 963
964 content::PushMessagingService* TestingProfile::GetPushMessagingService() { 964 content::PushMessagingService* TestingProfile::GetPushMessagingService() {
965 return NULL; 965 return NULL;
966 } 966 }
967 967
968 bool TestingProfile::IsSameProfile(Profile *p) { 968 bool TestingProfile::IsSameProfile(Profile *p) {
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 #if defined(ENABLE_EXTENSIONS) 1136 #if defined(ENABLE_EXTENSIONS)
1137 extension_policy_, 1137 extension_policy_,
1138 #endif 1138 #endif
1139 pref_service_.Pass(), 1139 pref_service_.Pass(),
1140 original_profile, 1140 original_profile,
1141 guest_session_, 1141 guest_session_,
1142 supervised_user_id_, 1142 supervised_user_id_,
1143 policy_service_.Pass(), 1143 policy_service_.Pass(),
1144 testing_factories_); 1144 testing_factories_);
1145 } 1145 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | components/BUILD.gn » ('j') | components/guest_view/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698