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

Side by Side Diff: chrome/browser/webdata/keyword_table_unittest.cc

Issue 8342049: Added Protector, hooked up DSE verification with error bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved histograms to protector folder Created 9 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
« no previous file with comments | « chrome/browser/webdata/keyword_table.cc ('k') | chrome/browser/webdata/web_data_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/time.h" 8 #include "base/time.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/common/chrome_paths.h" 10 #include "chrome/common/chrome_paths.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 TEST_F(KeywordTableTest, DefaultSearchProviderBackup) { 159 TEST_F(KeywordTableTest, DefaultSearchProviderBackup) {
160 WebDatabase db; 160 WebDatabase db;
161 161
162 ASSERT_EQ(sql::INIT_OK, db.Init(file_)); 162 ASSERT_EQ(sql::INIT_OK, db.Init(file_));
163 163
164 EXPECT_EQ(0, db.GetKeywordTable()->GetDefaultSearchProviderID()); 164 EXPECT_EQ(0, db.GetKeywordTable()->GetDefaultSearchProviderID());
165 165
166 ASSERT_TRUE(db.GetKeywordTable()->SetDefaultSearchProviderID(10)); 166 ASSERT_TRUE(db.GetKeywordTable()->SetDefaultSearchProviderID(10));
167 EXPECT_EQ(10, db.GetKeywordTable()->GetDefaultSearchProviderID()); 167 EXPECT_EQ(10, db.GetKeywordTable()->GetDefaultSearchProviderID());
168 EXPECT_EQ(10, db.GetKeywordTable()->GetDefaultSearchProviderIDBackup());
169 EXPECT_FALSE(db.GetKeywordTable()->DidDefaultSearchProviderChange());
168 170
169 // Verify that backup doesn't affect the actual value for now. 171 // Verify that backup doesn't affect the actual value for now.
170 ASSERT_TRUE(db.GetKeywordTable()->SetDefaultSearchProviderBackupID(11)); 172 ASSERT_TRUE(db.GetKeywordTable()->SetDefaultSearchProviderBackupID(11));
171 EXPECT_EQ(10, db.GetKeywordTable()->GetDefaultSearchProviderID()); 173 EXPECT_EQ(10, db.GetKeywordTable()->GetDefaultSearchProviderID());
174 EXPECT_EQ(11, db.GetKeywordTable()->GetDefaultSearchProviderIDBackup());
175 EXPECT_TRUE(db.GetKeywordTable()->DidDefaultSearchProviderChange());
172 } 176 }
173 177
174 TEST_F(KeywordTableTest, UpdateKeyword) { 178 TEST_F(KeywordTableTest, UpdateKeyword) {
175 WebDatabase db; 179 WebDatabase db;
176 180
177 ASSERT_EQ(sql::INIT_OK, db.Init(file_)); 181 ASSERT_EQ(sql::INIT_OK, db.Init(file_));
178 182
179 TemplateURL template_url; 183 TemplateURL template_url;
180 template_url.set_short_name(ASCIIToUTF16("short_name")); 184 template_url.set_short_name(ASCIIToUTF16("short_name"));
181 template_url.set_keyword(ASCIIToUTF16("keyword")); 185 template_url.set_keyword(ASCIIToUTF16("keyword"));
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 EXPECT_TRUE(db.GetKeywordTable()->GetKeywords(&template_urls)); 294 EXPECT_TRUE(db.GetKeywordTable()->GetKeywords(&template_urls));
291 EXPECT_EQ(1U, template_urls.size()); 295 EXPECT_EQ(1U, template_urls.size());
292 const TemplateURL* restored_url = template_urls.front(); 296 const TemplateURL* restored_url = template_urls.front();
293 297
294 EXPECT_EQ(template_url.short_name(), restored_url->short_name()); 298 EXPECT_EQ(template_url.short_name(), restored_url->short_name());
295 EXPECT_EQ(template_url.keyword(), restored_url->keyword()); 299 EXPECT_EQ(template_url.keyword(), restored_url->keyword());
296 EXPECT_EQ(GetID(&template_url), GetID(restored_url)); 300 EXPECT_EQ(GetID(&template_url), GetID(restored_url));
297 EXPECT_FALSE(restored_url->sync_guid().empty()); 301 EXPECT_FALSE(restored_url->sync_guid().empty());
298 delete restored_url; 302 delete restored_url;
299 } 303 }
OLDNEW
« no previous file with comments | « chrome/browser/webdata/keyword_table.cc ('k') | chrome/browser/webdata/web_data_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698