| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "testing/gtest/include/gtest/gtest.h" | 5 #include "testing/gtest/include/gtest/gtest.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time, | 91 EXPECT_EQ(BookmarkValuesToString(on_toolbar, url, title, creation_time, |
| 92 f1, f2, f3), | 92 f1, f2, f3), |
| 93 BookmarkEntryToString(entry)); | 93 BookmarkEntryToString(entry)); |
| 94 } | 94 } |
| 95 | 95 |
| 96 FilePath path_; | 96 FilePath path_; |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 // Tests bookmark_html_writer by populating a BookmarkModel, writing it out by | 99 // Tests bookmark_html_writer by populating a BookmarkModel, writing it out by |
| 100 // way of bookmark_html_writer, then using the importer to read it back in. | 100 // way of bookmark_html_writer, then using the importer to read it back in. |
| 101 TEST_F(BookmarkHTMLWriterTest, Test) { | 101 // Flaky, http://crbug.com/17592. |
| 102 TEST_F(BookmarkHTMLWriterTest, FLAKY_Test) { |
| 102 // Populate the BookmarkModel. This creates the following bookmark structure: | 103 // Populate the BookmarkModel. This creates the following bookmark structure: |
| 103 // Bookmarks bar | 104 // Bookmarks bar |
| 104 // F1 | 105 // F1 |
| 105 // url1 | 106 // url1 |
| 106 // F2 | 107 // F2 |
| 107 // url2 | 108 // url2 |
| 108 // url3 | 109 // url3 |
| 109 // url4 | 110 // url4 |
| 110 // Other | 111 // Other |
| 111 // url1 | 112 // url1 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4, | 177 AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4, |
| 177 kBookmarkBarFolderName, std::wstring(), | 178 kBookmarkBarFolderName, std::wstring(), |
| 178 std::wstring()); | 179 std::wstring()); |
| 179 AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1, | 180 AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1, |
| 180 std::wstring(), std::wstring(), std::wstring()); | 181 std::wstring(), std::wstring(), std::wstring()); |
| 181 AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2, | 182 AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2, |
| 182 std::wstring(), std::wstring(), std::wstring()); | 183 std::wstring(), std::wstring(), std::wstring()); |
| 183 AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1, | 184 AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1, |
| 184 f3_title, f4_title, std::wstring()); | 185 f3_title, f4_title, std::wstring()); |
| 185 } | 186 } |
| OLD | NEW |