| OLD | NEW |
| 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 "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 SetUpHelper(); | 46 SetUpHelper(); |
| 47 } | 47 } |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 void InstantUnitTestBase::SetUserSelectedDefaultSearchProvider( | 50 void InstantUnitTestBase::SetUserSelectedDefaultSearchProvider( |
| 51 const std::string& base_url) { | 51 const std::string& base_url) { |
| 52 TemplateURLData data; | 52 TemplateURLData data; |
| 53 data.SetShortName(base::UTF8ToUTF16(base_url)); | 53 data.SetShortName(base::UTF8ToUTF16(base_url)); |
| 54 data.SetKeyword(base::UTF8ToUTF16(base_url)); | 54 data.SetKeyword(base::UTF8ToUTF16(base_url)); |
| 55 data.SetURL(base_url + "url?bar={searchTerms}"); | 55 data.SetURL(base_url + "url?bar={searchTerms}"); |
| 56 data.instant_url = base_url + | 56 data.instant_url = |
| 57 "instant?{google:omniboxStartMarginParameter}{google:forceInstantResults}" | 57 base_url + "instant?{google:forceInstantResults}foo=foo#foo=foo&strk"; |
| 58 "foo=foo#foo=foo&strk"; | |
| 59 data.new_tab_url = base_url + "newtab"; | 58 data.new_tab_url = base_url + "newtab"; |
| 60 data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}"); | 59 data.alternate_urls.push_back(base_url + "alt#quux={searchTerms}"); |
| 61 data.search_terms_replacement_key = "strk"; | 60 data.search_terms_replacement_key = "strk"; |
| 62 | 61 |
| 63 TemplateURL* template_url = new TemplateURL(data); | 62 TemplateURL* template_url = new TemplateURL(data); |
| 64 // Takes ownership of |template_url|. | 63 // Takes ownership of |template_url|. |
| 65 template_url_service_->Add(template_url); | 64 template_url_service_->Add(template_url); |
| 66 template_url_service_->SetUserSelectedDefaultSearchProvider(template_url); | 65 template_url_service_->SetUserSelectedDefaultSearchProvider(template_url); |
| 67 } | 66 } |
| 68 | 67 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 92 void InstantUnitTestBase::SetUpHelper() { | 91 void InstantUnitTestBase::SetUpHelper() { |
| 93 BrowserWithTestWindowTest::SetUp(); | 92 BrowserWithTestWindowTest::SetUp(); |
| 94 | 93 |
| 95 template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile()); | 94 template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile()); |
| 96 search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_); | 95 search_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_); |
| 97 | 96 |
| 98 UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/"); | 97 UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/"); |
| 99 SetUserSelectedDefaultSearchProvider("{google:baseURL}"); | 98 SetUserSelectedDefaultSearchProvider("{google:baseURL}"); |
| 100 instant_service_ = InstantServiceFactory::GetForProfile(profile()); | 99 instant_service_ = InstantServiceFactory::GetForProfile(profile()); |
| 101 } | 100 } |
| OLD | NEW |