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

Side by Side Diff: chrome/browser/diagnostics/diagnostics_model.cc

Issue 10837244: Replace HistoryQuickProvider protobuf-based caching with an SQLite-based database. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Tweak suppression. Created 8 years, 4 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 "chrome/browser/diagnostics/diagnostics_model.h" 5 #include "chrome/browser/diagnostics/diagnostics_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 tests_.push_back(MakeResourcesFileTest()); 92 tests_.push_back(MakeResourcesFileTest());
93 tests_.push_back(MakeDiskSpaceTest()); 93 tests_.push_back(MakeDiskSpaceTest());
94 tests_.push_back(MakePreferencesTest()); 94 tests_.push_back(MakePreferencesTest());
95 tests_.push_back(MakeLocalStateTest()); 95 tests_.push_back(MakeLocalStateTest());
96 tests_.push_back(MakeBookMarksTest()); 96 tests_.push_back(MakeBookMarksTest());
97 tests_.push_back(MakeSqliteWebDbTest()); 97 tests_.push_back(MakeSqliteWebDbTest());
98 tests_.push_back(MakeSqliteCookiesDbTest()); 98 tests_.push_back(MakeSqliteCookiesDbTest());
99 tests_.push_back(MakeSqliteHistoryDbTest()); 99 tests_.push_back(MakeSqliteHistoryDbTest());
100 tests_.push_back(MakeSqliteArchivedHistoryDbTest()); 100 tests_.push_back(MakeSqliteArchivedHistoryDbTest());
101 tests_.push_back(MakeSqliteThumbnailsDbTest()); 101 tests_.push_back(MakeSqliteThumbnailsDbTest());
102 tests_.push_back(MakeSqliteHQPCacheDbTest());
102 tests_.push_back(MakeSqliteAppCacheDbTest()); 103 tests_.push_back(MakeSqliteAppCacheDbTest());
103 tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest()); 104 tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest());
104 } 105 }
105 106
106 private: 107 private:
107 DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelWin); 108 DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelWin);
108 }; 109 };
109 110
110 #elif defined(OS_MACOSX) 111 #elif defined(OS_MACOSX)
111 class DiagnosticsModelMac : public DiagnosticsModelImpl { 112 class DiagnosticsModelMac : public DiagnosticsModelImpl {
112 public: 113 public:
113 DiagnosticsModelMac() { 114 DiagnosticsModelMac() {
114 tests_.push_back(MakeInstallTypeTest()); 115 tests_.push_back(MakeInstallTypeTest());
115 tests_.push_back(MakeUserDirTest()); 116 tests_.push_back(MakeUserDirTest());
116 tests_.push_back(MakeLocalStateFileTest()); 117 tests_.push_back(MakeLocalStateFileTest());
117 tests_.push_back(MakeDictonaryDirTest()); 118 tests_.push_back(MakeDictonaryDirTest());
118 tests_.push_back(MakeResourcesFileTest()); 119 tests_.push_back(MakeResourcesFileTest());
119 tests_.push_back(MakeDiskSpaceTest()); 120 tests_.push_back(MakeDiskSpaceTest());
120 tests_.push_back(MakePreferencesTest()); 121 tests_.push_back(MakePreferencesTest());
121 tests_.push_back(MakeLocalStateTest()); 122 tests_.push_back(MakeLocalStateTest());
122 tests_.push_back(MakeBookMarksTest()); 123 tests_.push_back(MakeBookMarksTest());
123 tests_.push_back(MakeSqliteWebDbTest()); 124 tests_.push_back(MakeSqliteWebDbTest());
124 tests_.push_back(MakeSqliteCookiesDbTest()); 125 tests_.push_back(MakeSqliteCookiesDbTest());
125 tests_.push_back(MakeSqliteHistoryDbTest()); 126 tests_.push_back(MakeSqliteHistoryDbTest());
126 tests_.push_back(MakeSqliteArchivedHistoryDbTest()); 127 tests_.push_back(MakeSqliteArchivedHistoryDbTest());
127 tests_.push_back(MakeSqliteThumbnailsDbTest()); 128 tests_.push_back(MakeSqliteThumbnailsDbTest());
129 tests_.push_back(MakeSqliteHistoryDbTest());
128 tests_.push_back(MakeSqliteAppCacheDbTest()); 130 tests_.push_back(MakeSqliteAppCacheDbTest());
129 tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest()); 131 tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest());
130 } 132 }
131 133
132 private: 134 private:
133 DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelMac); 135 DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelMac);
134 }; 136 };
135 137
136 #elif defined(OS_POSIX) 138 #elif defined(OS_POSIX)
137 class DiagnosticsModelPosix : public DiagnosticsModelImpl { 139 class DiagnosticsModelPosix : public DiagnosticsModelImpl {
138 public: 140 public:
139 DiagnosticsModelPosix() { 141 DiagnosticsModelPosix() {
140 tests_.push_back(MakeInstallTypeTest()); 142 tests_.push_back(MakeInstallTypeTest());
141 tests_.push_back(MakeVersionTest()); 143 tests_.push_back(MakeVersionTest());
142 tests_.push_back(MakeUserDirTest()); 144 tests_.push_back(MakeUserDirTest());
143 tests_.push_back(MakeLocalStateFileTest()); 145 tests_.push_back(MakeLocalStateFileTest());
144 tests_.push_back(MakeDictonaryDirTest()); 146 tests_.push_back(MakeDictonaryDirTest());
145 tests_.push_back(MakeResourcesFileTest()); 147 tests_.push_back(MakeResourcesFileTest());
146 tests_.push_back(MakeDiskSpaceTest()); 148 tests_.push_back(MakeDiskSpaceTest());
147 tests_.push_back(MakePreferencesTest()); 149 tests_.push_back(MakePreferencesTest());
148 tests_.push_back(MakeLocalStateTest()); 150 tests_.push_back(MakeLocalStateTest());
149 tests_.push_back(MakeBookMarksTest()); 151 tests_.push_back(MakeBookMarksTest());
150 tests_.push_back(MakeSqliteWebDbTest()); 152 tests_.push_back(MakeSqliteWebDbTest());
151 tests_.push_back(MakeSqliteCookiesDbTest()); 153 tests_.push_back(MakeSqliteCookiesDbTest());
152 tests_.push_back(MakeSqliteHistoryDbTest()); 154 tests_.push_back(MakeSqliteHistoryDbTest());
153 tests_.push_back(MakeSqliteArchivedHistoryDbTest()); 155 tests_.push_back(MakeSqliteArchivedHistoryDbTest());
154 tests_.push_back(MakeSqliteThumbnailsDbTest()); 156 tests_.push_back(MakeSqliteThumbnailsDbTest());
157 tests_.push_back(MakeSqliteHistoryDbTest());
155 tests_.push_back(MakeSqliteAppCacheDbTest()); 158 tests_.push_back(MakeSqliteAppCacheDbTest());
156 tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest()); 159 tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest());
157 } 160 }
158 161
159 private: 162 private:
160 DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelPosix); 163 DISALLOW_COPY_AND_ASSIGN(DiagnosticsModelPosix);
161 }; 164 };
162 165
163 #endif 166 #endif
164 167
165 } // namespace 168 } // namespace
166 169
167 DiagnosticsModel* MakeDiagnosticsModel(const CommandLine& cmdline) { 170 DiagnosticsModel* MakeDiagnosticsModel(const CommandLine& cmdline) {
168 FilePath user_data_dir = cmdline.GetSwitchValuePath(switches::kUserDataDir); 171 FilePath user_data_dir = cmdline.GetSwitchValuePath(switches::kUserDataDir);
169 if (!user_data_dir.empty()) 172 if (!user_data_dir.empty())
170 PathService::Override(chrome::DIR_USER_DATA, user_data_dir); 173 PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
171 #if defined(OS_WIN) 174 #if defined(OS_WIN)
172 return new DiagnosticsModelWin(); 175 return new DiagnosticsModelWin();
173 #elif defined(OS_MACOSX) 176 #elif defined(OS_MACOSX)
174 return new DiagnosticsModelMac(); 177 return new DiagnosticsModelMac();
175 #elif defined(OS_POSIX) 178 #elif defined(OS_POSIX)
176 return new DiagnosticsModelPosix(); 179 return new DiagnosticsModelPosix();
177 #endif 180 #endif
178 } 181 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698