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

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

Issue 10021008: Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 8 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/webdata/web_data_service.cc ('k') | no next file » | 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) 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 EXPECT_EQ("service_url_2", consumer.services_[0].service_url); 788 EXPECT_EQ("service_url_2", consumer.services_[0].service_url);
789 } 789 }
790 #endif // defined(ENABLE_WEB_INTENTS) 790 #endif // defined(ENABLE_WEB_INTENTS)
791 791
792 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { 792 TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) {
793 KeywordsConsumer consumer; 793 KeywordsConsumer consumer;
794 wds_->GetKeywords(&consumer); 794 wds_->GetKeywords(&consumer);
795 WaitUntilCalled(); 795 WaitUntilCalled();
796 ASSERT_TRUE(consumer.load_succeeded); 796 ASSERT_TRUE(consumer.load_succeeded);
797 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change); 797 EXPECT_FALSE(consumer.keywords_result.did_default_search_provider_change);
798 EXPECT_EQ(NULL, consumer.keywords_result.default_search_provider_backup); 798 EXPECT_FALSE(consumer.keywords_result.backup_valid);
799 } 799 }
OLDNEW
« no previous file with comments | « chrome/browser/webdata/web_data_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698