| 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 "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 6 #include "base/file_util.h" |
| 6 #include "base/scoped_temp_dir.h" | 7 #include "base/scoped_temp_dir.h" |
| 7 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 8 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "base/values.h" |
| 11 #include "chrome/browser/chrome_thread.h" |
| 9 #include "chrome/browser/history/top_sites.h" | 12 #include "chrome/browser/history/top_sites.h" |
| 10 #include "chrome/common/chrome_paths.h" | |
| 11 #include "chrome/browser/dom_ui/most_visited_handler.h" | 13 #include "chrome/browser/dom_ui/most_visited_handler.h" |
| 12 #include "chrome/browser/history/history_marshaling.h" | 14 #include "chrome/browser/history/history_marshaling.h" |
| 13 #include "chrome/browser/history/top_sites_database.h" | 15 #include "chrome/browser/history/top_sites_database.h" |
| 14 #include "chrome/browser/history/history_notifications.h" | 16 #include "chrome/browser/history/history_notifications.h" |
| 17 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/test/testing_profile.h" | 18 #include "chrome/test/testing_profile.h" |
| 16 #include "chrome/tools/profiles/thumbnail-inl.h" | 19 #include "chrome/tools/profiles/thumbnail-inl.h" |
| 17 #include "gfx/codec/jpeg_codec.h" | 20 #include "gfx/codec/jpeg_codec.h" |
| 18 #include "googleurl/src/gurl.h" | 21 #include "googleurl/src/gurl.h" |
| 19 #include "grit/chromium_strings.h" | 22 #include "grit/chromium_strings.h" |
| 20 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
| 21 #include "grit/locale_settings.h" | 24 #include "grit/locale_settings.h" |
| 22 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
| 23 #include "third_party/skia/include/core/SkBitmap.h" | 26 #include "third_party/skia/include/core/SkBitmap.h" |
| 24 | 27 |
| (...skipping 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1325 | 1328 |
| 1326 top_sites().RemoveBlacklistedURL(store_url); | 1329 top_sites().RemoveBlacklistedURL(store_url); |
| 1327 EXPECT_EQ(6, top_sites().GetIndexForChromeStore(pages)); | 1330 EXPECT_EQ(6, top_sites().GetIndexForChromeStore(pages)); |
| 1328 | 1331 |
| 1329 top_sites().AddPinnedURL(GURL("http://bbc.com"), 2); | 1332 top_sites().AddPinnedURL(GURL("http://bbc.com"), 2); |
| 1330 // All pinned - can't add store. | 1333 // All pinned - can't add store. |
| 1331 EXPECT_EQ(-1, top_sites().GetIndexForChromeStore(pages)); | 1334 EXPECT_EQ(-1, top_sites().GetIndexForChromeStore(pages)); |
| 1332 } | 1335 } |
| 1333 | 1336 |
| 1334 } // namespace history | 1337 } // namespace history |
| OLD | NEW |