OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/policy/cloud/policy_header_service_factory.h" | 5 #include "chrome/browser/policy/cloud/policy_header_service_factory.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 10 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 scoped_ptr<PolicyHeaderService> service = make_scoped_ptr( | 106 scoped_ptr<PolicyHeaderService> service = make_scoped_ptr( |
107 new PolicyHeaderService(device_management_service->GetServerUrl(), | 107 new PolicyHeaderService(device_management_service->GetServerUrl(), |
108 kPolicyVerificationKeyHash, | 108 kPolicyVerificationKeyHash, |
109 user_store, | 109 user_store, |
110 device_store)); | 110 device_store)); |
111 return new PolicyHeaderServiceWrapper(service.Pass()); | 111 return new PolicyHeaderServiceWrapper(service.Pass()); |
112 } | 112 } |
113 | 113 |
114 // static | 114 // static |
115 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() { | 115 PolicyHeaderServiceFactory* PolicyHeaderServiceFactory::GetInstance() { |
116 return Singleton<PolicyHeaderServiceFactory>::get(); | 116 return base::Singleton<PolicyHeaderServiceFactory>::get(); |
117 } | 117 } |
118 | 118 |
119 } // namespace policy | 119 } // namespace policy |
OLD | NEW |