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

Side by Side Diff: chrome/browser/history/thumbnail_database_unittest.cc

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <algorithm> 5 #include <algorithm>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/files/scoped_temp_dir.h"
12 #include "base/memory/ref_counted_memory.h" 13 #include "base/memory/ref_counted_memory.h"
13 #include "base/path_service.h" 14 #include "base/path_service.h"
14 #include "base/scoped_temp_dir.h"
15 #include "chrome/browser/history/history_database.h" 15 #include "chrome/browser/history/history_database.h"
16 #include "chrome/browser/history/history_unittest_base.h" 16 #include "chrome/browser/history/history_unittest_base.h"
17 #include "chrome/browser/history/thumbnail_database.h" 17 #include "chrome/browser/history/thumbnail_database.h"
18 #include "chrome/common/chrome_constants.h" 18 #include "chrome/common/chrome_constants.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/thumbnail_score.h" 20 #include "chrome/common/thumbnail_score.h"
21 #include "chrome/test/base/testing_profile.h" 21 #include "chrome/test/base/testing_profile.h"
22 #include "chrome/tools/profiles/thumbnail-inl.h" 22 #include "chrome/tools/profiles/thumbnail-inl.h"
23 #include "googleurl/src/gurl.h" 23 #include "googleurl/src/gurl.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 const FaviconSizes GetFaviconSizesSmallAndLarge() { 73 const FaviconSizes GetFaviconSizesSmallAndLarge() {
74 FaviconSizes sizes_small_and_large; 74 FaviconSizes sizes_small_and_large;
75 sizes_small_and_large.push_back(kSmallSize); 75 sizes_small_and_large.push_back(kSmallSize);
76 sizes_small_and_large.push_back(kLargeSize); 76 sizes_small_and_large.push_back(kLargeSize);
77 return sizes_small_and_large; 77 return sizes_small_and_large;
78 } 78 }
79 79
80 scoped_ptr<SkBitmap> google_bitmap_; 80 scoped_ptr<SkBitmap> google_bitmap_;
81 81
82 ScopedTempDir temp_dir_; 82 base::ScopedTempDir temp_dir_;
83 FilePath file_name_; 83 FilePath file_name_;
84 FilePath new_file_name_; 84 FilePath new_file_name_;
85 FilePath history_db_name_; 85 FilePath history_db_name_;
86 }; 86 };
87 87
88 class IconMappingMigrationTest : public HistoryUnitTestBase { 88 class IconMappingMigrationTest : public HistoryUnitTestBase {
89 public: 89 public:
90 IconMappingMigrationTest() { 90 IconMappingMigrationTest() {
91 } 91 }
92 ~IconMappingMigrationTest() { 92 ~IconMappingMigrationTest() {
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 } 868 }
869 869
870 std::string sizes_as_string; 870 std::string sizes_as_string;
871 ThumbnailDatabase::FaviconSizesToDatabaseString(sizes_valid, 871 ThumbnailDatabase::FaviconSizesToDatabaseString(sizes_valid,
872 &sizes_as_string); 872 &sizes_as_string);
873 EXPECT_TRUE(sizes_as_string == "10 15 20 25" || 873 EXPECT_TRUE(sizes_as_string == "10 15 20 25" ||
874 sizes_as_string == "20 25 10 15"); 874 sizes_as_string == "20 25 10 15");
875 } 875 }
876 876
877 } // namespace history 877 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/text_database_unittest.cc ('k') | chrome/browser/history/top_sites_database_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698