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

Side by Side Diff: chrome/browser/search/instant_service_unittest.cc

Issue 231863008: Rename SetDefaultSearchProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 } 56 }
57 57
58 scoped_ptr<MockInstantServiceObserver> instant_service_observer_; 58 scoped_ptr<MockInstantServiceObserver> instant_service_observer_;
59 }; 59 };
60 60
61 TEST_F(InstantServiceTest, DispatchDefaultSearchProviderChanged) { 61 TEST_F(InstantServiceTest, DispatchDefaultSearchProviderChanged) {
62 EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged()) 62 EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
63 .Times(1); 63 .Times(1);
64 64
65 const std::string& new_base_url = "https://bar.com/"; 65 const std::string& new_base_url = "https://bar.com/";
66 SetDefaultSearchProvider(new_base_url); 66 SetUserSelectedDefaultSearchProvider(new_base_url);
67 } 67 }
68 68
69 TEST_F(InstantServiceTest, DispatchGoogleURLUpdated) { 69 TEST_F(InstantServiceTest, DispatchGoogleURLUpdated) {
70 EXPECT_CALL(*instant_service_observer_.get(), GoogleURLUpdated()).Times(1); 70 EXPECT_CALL(*instant_service_observer_.get(), GoogleURLUpdated()).Times(1);
71 71
72 const std::string& new_base_url = "https://www.google.es/"; 72 const std::string& new_base_url = "https://www.google.es/";
73 NotifyGoogleBaseURLUpdate(new_base_url); 73 NotifyGoogleBaseURLUpdate(new_base_url);
74 } 74 }
75 75
76 TEST_F(InstantServiceTest, SendsSearchURLsToRenderer) { 76 TEST_F(InstantServiceTest, SendsSearchURLsToRenderer) {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1")); 108 "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
109 EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged()) 109 EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
110 .Times(2); 110 .Times(2);
111 111
112 // Set a default search provider that doesn't support Instant. 112 // Set a default search provider that doesn't support Instant.
113 TemplateURLData data; 113 TemplateURLData data;
114 data.SetURL("https://foobar.com/url?bar={searchTerms}"); 114 data.SetURL("https://foobar.com/url?bar={searchTerms}");
115 TemplateURL* template_url = new TemplateURL(profile(), data); 115 TemplateURL* template_url = new TemplateURL(profile(), data);
116 // Takes ownership of |template_url|. 116 // Takes ownership of |template_url|.
117 template_url_service_->Add(template_url); 117 template_url_service_->Add(template_url);
118 template_url_service_->SetDefaultSearchProvider(template_url); 118 template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
119 119
120 EXPECT_EQ(static_cast<InstantSearchPrerenderer*>(NULL), 120 EXPECT_EQ(static_cast<InstantSearchPrerenderer*>(NULL),
121 GetInstantSearchPrerenderer()); 121 GetInstantSearchPrerenderer());
122 122
123 // Set a default search provider that supports Instant and make sure 123 // Set a default search provider that supports Instant and make sure
124 // InstantSearchPrerenderer is valid. 124 // InstantSearchPrerenderer is valid.
125 SetDefaultSearchProvider("https://google.com/"); 125 SetUserSelectedDefaultSearchProvider("https://google.com/");
126 EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL), 126 EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL),
127 GetInstantSearchPrerenderer()); 127 GetInstantSearchPrerenderer());
128 } 128 }
129 129
130 TEST_F(InstantServiceTest, ResetInstantSearchPrerenderer_GoogleBaseURLUpdated) { 130 TEST_F(InstantServiceTest, ResetInstantSearchPrerenderer_GoogleBaseURLUpdated) {
131 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( 131 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
132 "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1")); 132 "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
133 EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged()) 133 EXPECT_CALL(*instant_service_observer_.get(), DefaultSearchProviderChanged())
134 .Times(1); 134 .Times(1);
135 EXPECT_CALL(*instant_service_observer_.get(), GoogleURLUpdated()).Times(1); 135 EXPECT_CALL(*instant_service_observer_.get(), GoogleURLUpdated()).Times(1);
136 136
137 SetDefaultSearchProvider("https://google.com/"); 137 SetUserSelectedDefaultSearchProvider("https://google.com/");
138 InstantSearchPrerenderer* old_prerenderer = GetInstantSearchPrerenderer(); 138 InstantSearchPrerenderer* old_prerenderer = GetInstantSearchPrerenderer();
139 EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL), old_prerenderer); 139 EXPECT_NE(static_cast<InstantSearchPrerenderer*>(NULL), old_prerenderer);
140 140
141 const std::string& new_base_url = "https://www.google.es/"; 141 const std::string& new_base_url = "https://www.google.es/";
142 NotifyGoogleBaseURLUpdate(new_base_url); 142 NotifyGoogleBaseURLUpdate(new_base_url);
143 EXPECT_NE(old_prerenderer, GetInstantSearchPrerenderer()); 143 EXPECT_NE(old_prerenderer, GetInstantSearchPrerenderer());
144 } 144 }
145 145
146 TEST_F(InstantServiceTest, OmniboxStartMarginChanged) { 146 TEST_F(InstantServiceTest, OmniboxStartMarginChanged) {
147 int new_start_margin = 92; 147 int new_start_margin = 92;
148 EXPECT_CALL(*instant_service_observer_.get(), 148 EXPECT_CALL(*instant_service_observer_.get(),
149 OmniboxStartMarginChanged(new_start_margin)).Times(1); 149 OmniboxStartMarginChanged(new_start_margin)).Times(1);
150 UpdateOmniboxStartMargin(new_start_margin); 150 UpdateOmniboxStartMargin(new_start_margin);
151 } 151 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698