Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: chrome/browser/bookmarks/bookmark_html_writer_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/scoped_temp_dir.h" 11 #include "base/scoped_temp_dir.h"
12 #include "base/string16.h" 12 #include "base/string16.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/bookmarks/bookmark_html_writer.h" 16 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
17 #include "chrome/browser/bookmarks/bookmark_model.h" 17 #include "chrome/browser/bookmarks/bookmark_model.h"
18 #include "chrome/browser/importer/firefox2_importer.h" 18 #include "chrome/browser/importer/firefox2_importer.h"
19 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
20 #include "content/test/test_browser_thread.h" 20 #include "content/public/test/test_browser_thread.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 22 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/gfx/codec/png_codec.h" 24 #include "ui/gfx/codec/png_codec.h"
25 25
26 using content::BrowserThread; 26 using content::BrowserThread;
27 27
28 namespace { 28 namespace {
29 29
30 static const int kIconWidth = 16; 30 static const int kIconWidth = 16;
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 bookmark_folder_name, string16(), string16()); 258 bookmark_folder_name, string16(), string16());
259 AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1, 259 AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,
260 string16(), string16(), string16()); 260 string16(), string16(), string16());
261 AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2, 261 AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,
262 string16(), string16(), string16()); 262 string16(), string16(), string16());
263 AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1, 263 AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,
264 f3_title, f4_title, string16()); 264 f3_title, f4_title, string16());
265 AssertBookmarkEntryEquals(parsed_bookmarks[7], false, url1, url1_title, t1, 265 AssertBookmarkEntryEquals(parsed_bookmarks[7], false, url1, url1_title, t1,
266 string16(), string16(), string16()); 266 string16(), string16(), string16());
267 } 267 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698