summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 20:59:20 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 20:59:20 +0000
commit0891de655aafcca6c166a5cd2c06455fd88a3df5 (patch)
tree2ec84bb2ffc290441b3ebde40835922abae7cef9 /chrome
parenta6eb9915d271e8aee5a0e823372826971ddd5304 (diff)
downloadchromium_src-0891de655aafcca6c166a5cd2c06455fd88a3df5.zip
chromium_src-0891de655aafcca6c166a5cd2c06455fd88a3df5.tar.gz
chromium_src-0891de655aafcca6c166a5cd2c06455fd88a3df5.tar.bz2
Updates typical_profile data to include TopSites.
BUG=60946 TEST=none TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/4154006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/dom_ui/new_tab_ui_uitest.cc3
-rw-r--r--chrome/test/data/profiles/typical_history/Default/Historybin3309568 -> 13725696 bytes
-rw-r--r--chrome/test/data/profiles/typical_history/Default/Top Sitesbin12288 -> 192512 bytes
3 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
index 02e930a..7222405 100644
--- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc
+++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc
@@ -30,8 +30,7 @@ class NewTabUITest : public UITest {
}
};
-// See bug 60946.
-TEST_F(NewTabUITest, FLAKY_NTPHasThumbnails) {
+TEST_F(NewTabUITest, NTPHasThumbnails) {
// Switch to the "new tab" tab, which should be any new tab after the
// first (the first is about:blank).
scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
diff --git a/chrome/test/data/profiles/typical_history/Default/History b/chrome/test/data/profiles/typical_history/Default/History
index 6a6abd6..f4e176b 100644
--- a/chrome/test/data/profiles/typical_history/Default/History
+++ b/chrome/test/data/profiles/typical_history/Default/History
Binary files differ
diff --git a/chrome/test/data/profiles/typical_history/Default/Top Sites b/chrome/test/data/profiles/typical_history/Default/Top Sites
index 2661211..13c7a53 100644
--- a/chrome/test/data/profiles/typical_history/Default/Top Sites
+++ b/chrome/test/data/profiles/typical_history/Default/Top Sites
Binary files differ