| OLD | NEW |
| 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <fstream> | 6 #include <fstream> |
| 7 | 7 |
| 8 #include "base/auto_reset.h" | 8 #include "base/auto_reset.h" |
| 9 #include "base/file_util.h" | |
| 10 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" |
| 11 #include "base/files/scoped_temp_dir.h" | 11 #include "base/files/scoped_temp_dir.h" |
| 12 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
| 15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
| 16 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
| 17 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 17 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 18 #include "chrome/browser/chrome_notification_types.h" | 18 #include "chrome/browser/chrome_notification_types.h" |
| 19 #include "chrome/browser/history/history_backend.h" | 19 #include "chrome/browser/history/history_backend.h" |
| 20 #include "chrome/browser/history/history_database.h" | 20 #include "chrome/browser/history/history_database.h" |
| (...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1225 full_file_path.GetComponents(&actual_parts); | 1225 full_file_path.GetComponents(&actual_parts); |
| 1226 ASSERT_EQ(expected_parts.size(), actual_parts.size()); | 1226 ASSERT_EQ(expected_parts.size(), actual_parts.size()); |
| 1227 size_t count = expected_parts.size(); | 1227 size_t count = expected_parts.size(); |
| 1228 for (size_t i = 0; i < count; ++i) | 1228 for (size_t i = 0; i < count; ++i) |
| 1229 EXPECT_EQ(expected_parts[i], actual_parts[i]); | 1229 EXPECT_EQ(expected_parts[i], actual_parts[i]); |
| 1230 // Must clear the history_dir_ to satisfy the dtor's DCHECK. | 1230 // Must clear the history_dir_ to satisfy the dtor's DCHECK. |
| 1231 set_history_dir(base::FilePath()); | 1231 set_history_dir(base::FilePath()); |
| 1232 } | 1232 } |
| 1233 | 1233 |
| 1234 } // namespace history | 1234 } // namespace history |
| OLD | NEW |