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

Side by Side Diff: chrome/browser/chromeos/settings/owner_key_util.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 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 | 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/browser/chromeos/settings/owner_key_util.h" 5 #include "chrome/browser/chromeos/settings/owner_key_util.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/sys_info.h" 13 #include "base/sys_info.h"
14 #include "chromeos/chromeos_paths.h" 14 #include "chromeos/chromeos_paths.h"
15 #include "crypto/rsa_private_key.h" 15 #include "crypto/rsa_private_key.h"
16 16
17 namespace chromeos { 17 namespace chromeos {
18 18
19 /////////////////////////////////////////////////////////////////////////// 19 ///////////////////////////////////////////////////////////////////////////
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 const std::vector<uint8>& key, 89 const std::vector<uint8>& key,
90 PK11SlotInfo* slot) { 90 PK11SlotInfo* slot) {
91 return crypto::RSAPrivateKey::FindFromPublicKeyInfoInSlot(key, slot); 91 return crypto::RSAPrivateKey::FindFromPublicKeyInfoInSlot(key, slot);
92 } 92 }
93 93
94 bool OwnerKeyUtilImpl::IsPublicKeyPresent() { 94 bool OwnerKeyUtilImpl::IsPublicKeyPresent() {
95 return base::PathExists(key_file_); 95 return base::PathExists(key_file_);
96 } 96 }
97 97
98 } // namespace chromeos 98 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698