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

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

Issue 2290503003: Remove use of stl_util in search_engines. (Closed)
Patch Set: fix broken test Created 4 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
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 "chrome/browser/search/instant_unittest_base.h" 5 #include "chrome/browser/search/instant_unittest_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 TemplateURLData data; 53 TemplateURLData data;
54 data.SetShortName(base::UTF8ToUTF16(base_url)); 54 data.SetShortName(base::UTF8ToUTF16(base_url));
55 data.SetKeyword(base::UTF8ToUTF16(base_url)); 55 data.SetKeyword(base::UTF8ToUTF16(base_url));
56 data.SetURL(base_url + "url?bar={searchTerms}"); 56 data.SetURL(base_url + "url?bar={searchTerms}");
57 data.instant_url = 57 data.instant_url =
58 base_url + "instant?{google:forceInstantResults}foo=foo#foo=foo&strk"; 58 base_url + "instant?{google:forceInstantResults}foo=foo#foo=foo&strk";
59 data.new_tab_url = base_url + "newtab"; 59 data.new_tab_url = base_url + "newtab";
60 data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}"); 60 data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}");
61 data.search_terms_replacement_key = "strk"; 61 data.search_terms_replacement_key = "strk";
62 62
63 TemplateURL* template_url = new TemplateURL(data); 63 TemplateURL* template_url =
64 // Takes ownership of |template_url|. 64 template_url_service_->Add(base::MakeUnique<TemplateURL>(data));
65 template_url_service_->Add(template_url);
66 template_url_service_->SetUserSelectedDefaultSearchProvider(template_url); 65 template_url_service_->SetUserSelectedDefaultSearchProvider(template_url);
67 } 66 }
68 67
69 void InstantUnitTestBase::NotifyGoogleBaseURLUpdate( 68 void InstantUnitTestBase::NotifyGoogleBaseURLUpdate(
70 const std::string& new_google_base_url) { 69 const std::string& new_google_base_url) {
71 // GoogleURLTracker is not created in tests. 70 // GoogleURLTracker is not created in tests.
72 // (See GoogleURLTrackerFactory::ServiceIsNULLWhileTesting()) 71 // (See GoogleURLTrackerFactory::ServiceIsNULLWhileTesting())
73 // For determining google:baseURL for NTP, the following is used: 72 // For determining google:baseURL for NTP, the following is used:
74 // UIThreadSearchTermsData::GoogleBaseURLValue() 73 // UIThreadSearchTermsData::GoogleBaseURLValue()
75 // For simulating test behavior, this is overridden below. 74 // For simulating test behavior, this is overridden below.
76 UIThreadSearchTermsData::SetGoogleBaseURL(new_google_base_url); 75 UIThreadSearchTermsData::SetGoogleBaseURL(new_google_base_url);
77 TemplateURLServiceFactory::GetForProfile(profile())->GoogleBaseURLChanged(); 76 TemplateURLServiceFactory::GetForProfile(profile())->GoogleBaseURLChanged();
78 } 77 }
79 78
80 bool InstantUnitTestBase::IsInstantServiceObserver( 79 bool InstantUnitTestBase::IsInstantServiceObserver(
81 const InstantServiceObserver* observer) const { 80 const InstantServiceObserver* observer) const {
82 return instant_service_->observers_.HasObserver(observer); 81 return instant_service_->observers_.HasObserver(observer);
83 } 82 }
84 83
85 TestingProfile* InstantUnitTestBase::CreateProfile() { 84 TestingProfile* InstantUnitTestBase::CreateProfile() {
86 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile(); 85 TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
87 TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse( 86 TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
88 profile, &TemplateURLServiceFactory::BuildInstanceFor); 87 profile, &TemplateURLServiceFactory::BuildInstanceFor);
89 return profile; 88 return profile;
90 } 89 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698