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

Side by Side Diff: chrome/browser/history/history_database.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/history/history_database.h" 5 #include "chrome/browser/history/history_database.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "base/rand_util.h" 14 #include "base/rand_util.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "sql/transaction.h" 17 #include "sql/transaction.h"
18 18
19 #if defined(OS_MACOSX) 19 #if defined(OS_MACOSX)
20 #include "base/mac/mac_util.h" 20 #include "base/mac/mac_util.h"
21 #endif 21 #endif
22 22
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 "SET visit_time = visit_time + 11644473600000000 " 451 "SET visit_time = visit_time + 11644473600000000 "
452 "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);")); 452 "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);"));
453 ignore_result(db_.Execute( 453 ignore_result(db_.Execute(
454 "UPDATE segment_usage " 454 "UPDATE segment_usage "
455 "SET time_slot = time_slot + 11644473600000000 " 455 "SET time_slot = time_slot + 11644473600000000 "
456 "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);")); 456 "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
457 } 457 }
458 #endif 458 #endif
459 459
460 } // namespace history 460 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/history_backend_unittest.cc ('k') | chrome/browser/history/history_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698