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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 3 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 <set> 5 #include <set>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/string16.h" 14 #include "base/string16.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/bookmarks/bookmark_model.h" 16 #include "chrome/browser/bookmarks/bookmark_model.h"
17 #include "chrome/browser/history/history_backend.h" 17 #include "chrome/browser/history/history_backend.h"
18 #include "chrome/browser/history/history_notifications.h" 18 #include "chrome/browser/history/history_notifications.h"
19 #include "chrome/browser/history/in_memory_database.h" 19 #include "chrome/browser/history/in_memory_database.h"
20 #include "chrome/browser/history/in_memory_history_backend.h" 20 #include "chrome/browser/history/in_memory_history_backend.h"
21 #include "chrome/common/chrome_constants.h" 21 #include "chrome/common/chrome_constants.h"
22 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/thumbnail_score.h" 23 #include "chrome/common/thumbnail_score.h"
24 #include "chrome/test/base/testing_browser_process_test.h"
25 #include "chrome/tools/profiles/thumbnail-inl.h" 24 #include "chrome/tools/profiles/thumbnail-inl.h"
26 #include "content/common/notification_details.h" 25 #include "content/common/notification_details.h"
27 #include "content/common/notification_source.h" 26 #include "content/common/notification_source.h"
28 #include "googleurl/src/gurl.h" 27 #include "googleurl/src/gurl.h"
29 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
30 #include "ui/gfx/codec/jpeg_codec.h" 29 #include "ui/gfx/codec/jpeg_codec.h"
31 #include "ui/gfx/image/image.h" 30 #include "ui/gfx/image/image.h"
32 31
33 using base::Time; 32 using base::Time;
34 33
(...skipping 27 matching lines...) Expand all
62 virtual void DBLoaded() OVERRIDE; 61 virtual void DBLoaded() OVERRIDE;
63 virtual void StartTopSitesMigration() OVERRIDE; 62 virtual void StartTopSitesMigration() OVERRIDE;
64 63
65 private: 64 private:
66 // Not owned by us. 65 // Not owned by us.
67 HistoryBackendTest* test_; 66 HistoryBackendTest* test_;
68 67
69 DISALLOW_COPY_AND_ASSIGN(HistoryBackendTestDelegate); 68 DISALLOW_COPY_AND_ASSIGN(HistoryBackendTestDelegate);
70 }; 69 };
71 70
72 class HistoryBackendTest : public TestingBrowserProcessTest { 71 class HistoryBackendTest : public testing::Test {
73 public: 72 public:
74 HistoryBackendTest() : bookmark_model_(NULL), loaded_(false) {} 73 HistoryBackendTest() : bookmark_model_(NULL), loaded_(false) {}
75 virtual ~HistoryBackendTest() { 74 virtual ~HistoryBackendTest() {
76 } 75 }
77 76
78 protected: 77 protected:
79 scoped_refptr<HistoryBackend> backend_; // Will be NULL on init failure. 78 scoped_refptr<HistoryBackend> backend_; // Will be NULL on init failure.
80 scoped_ptr<InMemoryHistoryBackend> mem_backend_; 79 scoped_ptr<InMemoryHistoryBackend> mem_backend_;
81 80
82 void AddRedirectChain(const char* sequence[], int page_id) { 81 void AddRedirectChain(const char* sequence[], int page_id) {
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
981 url, icon_id, FAVICON, &replaced)); 980 url, icon_id, FAVICON, &replaced));
982 EXPECT_EQ(0, replaced); 981 EXPECT_EQ(0, replaced);
983 982
984 std::vector<IconMapping> icon_mapping; 983 std::vector<IconMapping> icon_mapping;
985 EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL( 984 EXPECT_TRUE(backend_->thumbnail_db_->GetIconMappingsForPageURL(
986 url, &icon_mapping)); 985 url, &icon_mapping));
987 EXPECT_EQ(1u, icon_mapping.size()); 986 EXPECT_EQ(1u, icon_mapping.size());
988 } 987 }
989 988
990 } // namespace history 989 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698