chrome/browser/bookmarks/bookmark_html_writer_unittest.cc - Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base.

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

Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: unknwn Created 9 years, 7 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

« no previous file with comments | « chrome/browser/aeropeek_manager.cc ('k') | chrome/browser/browser_encoding_uitest.cc » ('j') | no next file with comments »

OLD	NEW
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/message_loop.h"	9 #include "base/message_loop.h"

9 #include "base/path_service.h"	10 #include "base/path_service.h"

	11 #include "base/scoped_temp_dir.h"

10 #include "base/string16.h"	12 #include "base/string16.h"

11 #include "base/string_util.h"	13 #include "base/string_util.h"

12 #include "base/time.h"	14 #include "base/time.h"

13 #include "base/utf_string_conversions.h"	15 #include "base/utf_string_conversions.h"

14 #include "base/i18n/time_formatting.h"

15 #include "base/memory/scoped_temp_dir.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/testing_browser_process_test.h"	19 #include "chrome/test/testing_browser_process_test.h"

20 #include "chrome/test/testing_profile.h"	20 #include "chrome/test/testing_profile.h"

21 #include "content/browser/browser_thread.h"	21 #include "content/browser/browser_thread.h"

22 #include "grit/generated_resources.h"	22 #include "grit/generated_resources.h"

23 #include "third_party/skia/include/core/SkBitmap.h"	23 #include "third_party/skia/include/core/SkBitmap.h"

24 #include "ui/base/l10n/l10n_util.h"	24 #include "ui/base/l10n/l10n_util.h"

25 #include "ui/gfx/codec/png_codec.h"	25 #include "ui/gfx/codec/png_codec.h"

(...skipping 231 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
257 bookmark_folder_name, string16(), string16());	257 bookmark_folder_name, string16(), string16());

258 AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4,	258 AssertBookmarkEntryEquals(parsed_bookmarks[3], false, url4, url4_title, t4,

259 bookmark_folder_name, string16(), string16());	259 bookmark_folder_name, string16(), string16());

260 AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,	260 AssertBookmarkEntryEquals(parsed_bookmarks[4], false, url1, url1_title, t1,

261 string16(), string16(), string16());	261 string16(), string16(), string16());

262 AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,	262 AssertBookmarkEntryEquals(parsed_bookmarks[5], false, url2, url2_title, t2,

263 string16(), string16(), string16());	263 string16(), string16(), string16());

264 AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,	264 AssertBookmarkEntryEquals(parsed_bookmarks[6], false, url1, url1_title, t1,

265 f3_title, f4_title, string16());	265 f3_title, f4_title, string16());

266 }	266 }

OLD	NEW