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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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) 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 "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/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/i18n/time_formatting.h" 14 #include "base/i18n/time_formatting.h"
15 #include "chrome/browser/bookmarks/bookmark_html_writer.h" 15 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
16 #include "chrome/browser/bookmarks/bookmark_model.h" 16 #include "chrome/browser/bookmarks/bookmark_model.h"
17 #include "chrome/browser/browser_thread.h" 17 #include "chrome/browser/browser_thread.h"
18 #include "chrome/browser/importer/firefox2_importer.h" 18 #include "chrome/browser/importer/firefox2_importer.h"
19 #include "chrome/test/testing_profile.h" 19 #include "chrome/test/testing_profile.h"
20 #include "gfx/codec/png_codec.h"
21 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
22 #include "third_party/skia/include/core/SkBitmap.h" 21 #include "third_party/skia/include/core/SkBitmap.h"
23 #include "ui/base/l10n/l10n_util.h" 22 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/gfx/codec/png_codec.h"
24 24
25 namespace { 25 namespace {
26 26
27 static const int kIconWidth = 16; 27 static const int kIconWidth = 16;
28 static const int kIconHeight = 16; 28 static const int kIconHeight = 16;
29 29
30 void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) { 30 void MakeTestSkBitmap(int w, int h, SkBitmap* bmp) {
31 bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h); 31 bmp->setConfig(SkBitmap::kARGB_8888_Config, w, h);
32 bmp->allocPixels(); 32 bmp->allocPixels();
33 33
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 bookmark_folder_name, string16(), string16()); 256 bookmark_folder_name, string16(), string16());
257 AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4, 257 AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4,
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 } 265 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_folder_editor_controller.h ('k') | chrome/browser/bookmarks/bookmark_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698