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

Side by Side Diff: chrome/browser/safe_browsing/safe_browsing_store_file.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/safe_browsing/safe_browsing_store_file.h" 5 #include "chrome/browser/safe_browsing/safe_browsing_store_file.h"
6 6
7 #include "base/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_file.h" 8 #include "base/files/scoped_file.h"
9 #include "base/md5.h" 9 #include "base/md5.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
11 #include "base/metrics/sparse_histogram.h" 11 #include "base/metrics/sparse_histogram.h"
12 12
13 namespace { 13 namespace {
14 14
15 // NOTE(shess): kFileMagic should not be a byte-wise palindrome, so 15 // NOTE(shess): kFileMagic should not be a byte-wise palindrome, so
16 // that byte-order changes force corruption. 16 // that byte-order changes force corruption.
17 const int32 kFileMagic = 0x600D71FE; 17 const int32 kFileMagic = 0x600D71FE;
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 // With SQLite support gone, one way to get to this code is if the 1113 // With SQLite support gone, one way to get to this code is if the
1114 // existing file is a SQLite file. Make sure the journal file is 1114 // existing file is a SQLite file. Make sure the journal file is
1115 // also removed. 1115 // also removed.
1116 const base::FilePath journal_filename( 1116 const base::FilePath journal_filename(
1117 basename.value() + FILE_PATH_LITERAL("-journal")); 1117 basename.value() + FILE_PATH_LITERAL("-journal"));
1118 if (base::PathExists(journal_filename)) 1118 if (base::PathExists(journal_filename))
1119 base::DeleteFile(journal_filename, false); 1119 base::DeleteFile(journal_filename, false);
1120 1120
1121 return true; 1121 return true;
1122 } 1122 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698