| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/supervised_user/experimental/supervised_user_blacklist.
h" | 5 #include "chrome/browser/supervised_user/experimental/supervised_user_blacklist.
h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cstring> | 8 #include <cstring> |
| 9 #include <fstream> | 9 #include <fstream> |
| 10 | 10 |
| 11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
| 12 #include "base/files/memory_mapped_file.h" | 12 #include "base/files/memory_mapped_file.h" |
| 13 #include "content/public/browser/browser_thread.h" | 13 #include "content/public/browser/browser_thread.h" |
| 14 #include "url/gurl.h" | 14 #include "url/gurl.h" |
| 15 | 15 |
| 16 using content::BrowserThread; | 16 using content::BrowserThread; |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| 19 | 19 |
| 20 scoped_ptr<std::vector<SupervisedUserBlacklist::Hash> > | 20 std::unique_ptr<std::vector<SupervisedUserBlacklist::Hash>> |
| 21 ReadFromBinaryFileOnFileThread(const base::FilePath& path) { | 21 ReadFromBinaryFileOnFileThread(const base::FilePath& path) { |
| 22 DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); | 22 DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
| 23 | 23 |
| 24 scoped_ptr<std::vector<SupervisedUserBlacklist::Hash> > host_hashes( | 24 std::unique_ptr<std::vector<SupervisedUserBlacklist::Hash>> host_hashes( |
| 25 new std::vector<SupervisedUserBlacklist::Hash>); | 25 new std::vector<SupervisedUserBlacklist::Hash>); |
| 26 | 26 |
| 27 base::MemoryMappedFile file; | 27 base::MemoryMappedFile file; |
| 28 file.Initialize(path); | 28 file.Initialize(path); |
| 29 if (!file.IsValid()) | 29 if (!file.IsValid()) |
| 30 return host_hashes; | 30 return host_hashes; |
| 31 | 31 |
| 32 size_t size = file.length(); | 32 size_t size = file.length(); |
| 33 if (size <= 0 || size % base::kSHA1Length != 0) | 33 if (size <= 0 || size % base::kSHA1Length != 0) |
| 34 return host_hashes; | 34 return host_hashes; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN).get(), | 79 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN).get(), |
| 80 FROM_HERE, | 80 FROM_HERE, |
| 81 base::Bind(&ReadFromBinaryFileOnFileThread, path), | 81 base::Bind(&ReadFromBinaryFileOnFileThread, path), |
| 82 base::Bind(&SupervisedUserBlacklist::OnReadFromFileCompleted, | 82 base::Bind(&SupervisedUserBlacklist::OnReadFromFileCompleted, |
| 83 weak_ptr_factory_.GetWeakPtr(), | 83 weak_ptr_factory_.GetWeakPtr(), |
| 84 done_callback)); | 84 done_callback)); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void SupervisedUserBlacklist::OnReadFromFileCompleted( | 87 void SupervisedUserBlacklist::OnReadFromFileCompleted( |
| 88 const base::Closure& done_callback, | 88 const base::Closure& done_callback, |
| 89 scoped_ptr<std::vector<Hash> > host_hashes) { | 89 std::unique_ptr<std::vector<Hash>> host_hashes) { |
| 90 host_hashes_.swap(*host_hashes); | 90 host_hashes_.swap(*host_hashes); |
| 91 LOG_IF(WARNING, host_hashes_.empty()) << "Got empty blacklist"; | 91 LOG_IF(WARNING, host_hashes_.empty()) << "Got empty blacklist"; |
| 92 | 92 |
| 93 if (!done_callback.is_null()) | 93 if (!done_callback.is_null()) |
| 94 done_callback.Run(); | 94 done_callback.Run(); |
| 95 } | 95 } |
| OLD | NEW |