| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/format_macros.h" | 7 #include "base/format_macros.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "chrome/browser/browser_thread.h" | 13 #include "chrome/browser/browser_thread.h" |
| 14 #include "chrome/browser/dom_ui/most_visited_handler.h" | 14 #include "chrome/browser/dom_ui/most_visited_handler.h" |
| 15 #include "chrome/browser/history/history_backend.h" | 15 #include "chrome/browser/history/history_backend.h" |
| 16 #include "chrome/browser/history/history_database.h" | 16 #include "chrome/browser/history/history_database.h" |
| 17 #include "chrome/browser/history/history_marshaling.h" | 17 #include "chrome/browser/history/history_marshaling.h" |
| 18 #include "chrome/browser/history/history_notifications.h" | 18 #include "chrome/browser/history/history_notifications.h" |
| 19 #include "chrome/browser/history/top_sites.h" | 19 #include "chrome/browser/history/top_sites.h" |
| 20 #include "chrome/browser/history/top_sites_backend.h" | 20 #include "chrome/browser/history/top_sites_backend.h" |
| 21 #include "chrome/browser/history/top_sites_cache.h" | 21 #include "chrome/browser/history/top_sites_cache.h" |
| 22 #include "chrome/browser/history/top_sites_database.h" | 22 #include "chrome/browser/history/top_sites_database.h" |
| 23 #include "chrome/common/chrome_constants.h" | 23 #include "chrome/common/chrome_constants.h" |
| 24 #include "chrome/common/chrome_paths.h" | 24 #include "chrome/common/chrome_paths.h" |
| 25 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
| 26 #include "chrome/test/testing_profile.h" | 26 #include "chrome/test/testing_profile.h" |
| 27 #include "chrome/tools/profiles/thumbnail-inl.h" | 27 #include "chrome/tools/profiles/thumbnail-inl.h" |
| 28 #include "gfx/codec/jpeg_codec.h" | |
| 29 #include "googleurl/src/gurl.h" | 28 #include "googleurl/src/gurl.h" |
| 30 #include "grit/chromium_strings.h" | 29 #include "grit/chromium_strings.h" |
| 31 #include "grit/generated_resources.h" | 30 #include "grit/generated_resources.h" |
| 32 #include "grit/locale_settings.h" | 31 #include "grit/locale_settings.h" |
| 33 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
| 34 #include "third_party/skia/include/core/SkBitmap.h" | 33 #include "third_party/skia/include/core/SkBitmap.h" |
| 35 #include "ui/base/l10n/l10n_util.h" | 34 #include "ui/base/l10n/l10n_util.h" |
| 35 #include "ui/gfx/codec/jpeg_codec.h" |
| 36 | 36 |
| 37 namespace history { | 37 namespace history { |
| 38 | 38 |
| 39 namespace { | 39 namespace { |
| 40 | 40 |
| 41 // Used by WaitForHistory, see it for details. | 41 // Used by WaitForHistory, see it for details. |
| 42 class WaitForHistoryTask : public HistoryDBTask { | 42 class WaitForHistoryTask : public HistoryDBTask { |
| 43 public: | 43 public: |
| 44 WaitForHistoryTask() {} | 44 WaitForHistoryTask() {} |
| 45 | 45 |
| (...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1347 WaitForTopSites(); | 1347 WaitForTopSites(); |
| 1348 EXPECT_FALSE(IsTopSitesLoaded()); | 1348 EXPECT_FALSE(IsTopSitesLoaded()); |
| 1349 | 1349 |
| 1350 // Load history, which should make TopSites finish loading too. | 1350 // Load history, which should make TopSites finish loading too. |
| 1351 profile()->CreateHistoryService(false, false); | 1351 profile()->CreateHistoryService(false, false); |
| 1352 profile()->BlockUntilTopSitesLoaded(); | 1352 profile()->BlockUntilTopSitesLoaded(); |
| 1353 EXPECT_TRUE(IsTopSitesLoaded()); | 1353 EXPECT_TRUE(IsTopSitesLoaded()); |
| 1354 } | 1354 } |
| 1355 | 1355 |
| 1356 } // namespace history | 1356 } // namespace history |
| OLD | NEW |