| 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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
| 9 #include "chrome/browser/search_engines/template_url_service.h" | 9 #include "chrome/browser/search_engines/template_url_service.h" |
| 10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 10 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 void InstallTemplateURLWithNewTabPage(GURL new_tab_page_url) { | 102 void InstallTemplateURLWithNewTabPage(GURL new_tab_page_url) { |
| 103 TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse( | 103 TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse( |
| 104 profile(), &TemplateURLServiceFactory::BuildInstanceFor); | 104 profile(), &TemplateURLServiceFactory::BuildInstanceFor); |
| 105 TemplateURLService* template_url_service = | 105 TemplateURLService* template_url_service = |
| 106 TemplateURLServiceFactory::GetForProfile(browser()->profile()); | 106 TemplateURLServiceFactory::GetForProfile(browser()->profile()); |
| 107 ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service); | 107 ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service); |
| 108 | 108 |
| 109 TemplateURLData data; | 109 TemplateURLData data; |
| 110 data.SetURL("http://foo.com/url?bar={searchTerms}"); | 110 data.SetURL("http://foo.com/url?bar={searchTerms}"); |
| 111 data.new_tab_url = new_tab_page_url.spec(); | 111 data.new_tab_url = new_tab_page_url.spec(); |
| 112 TemplateURL* template_url = new TemplateURL(browser()->profile(), data); | 112 TemplateURL* template_url = new TemplateURL(data); |
| 113 // Takes ownership. | 113 // Takes ownership. |
| 114 template_url_service->Add(template_url); | 114 template_url_service->Add(template_url); |
| 115 template_url_service->SetUserSelectedDefaultSearchProvider(template_url); | 115 template_url_service->SetUserSelectedDefaultSearchProvider(template_url); |
| 116 } | 116 } |
| 117 | 117 |
| 118 scoped_ptr<base::FieldTrialList> field_trial_list_; | 118 scoped_ptr<base::FieldTrialList> field_trial_list_; |
| 119 }; | 119 }; |
| 120 | 120 |
| 121 TEST_F(InstantNTPURLRewriteTest, UberURLHandler_InstantExtendedNewTabPage) { | 121 TEST_F(InstantNTPURLRewriteTest, UberURLHandler_InstantExtendedNewTabPage) { |
| 122 const GURL url_original("chrome://newtab"); | 122 const GURL url_original("chrome://newtab"); |
| 123 const GURL url_rewritten("https://www.example.com/newtab"); | 123 const GURL url_rewritten("https://www.example.com/newtab"); |
| 124 InstallTemplateURLWithNewTabPage(url_rewritten); | 124 InstallTemplateURLWithNewTabPage(url_rewritten); |
| 125 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended", | 125 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("InstantExtended", |
| 126 "Group1 use_cacheable_ntp:1")); | 126 "Group1 use_cacheable_ntp:1")); |
| 127 | 127 |
| 128 AddTab(browser(), GURL("chrome://blank")); | 128 AddTab(browser(), GURL("chrome://blank")); |
| 129 NavigateAndCommitActiveTab(url_original); | 129 NavigateAndCommitActiveTab(url_original); |
| 130 | 130 |
| 131 NavigationEntry* entry = browser()->tab_strip_model()-> | 131 NavigationEntry* entry = browser()->tab_strip_model()-> |
| 132 GetActiveWebContents()->GetController().GetLastCommittedEntry(); | 132 GetActiveWebContents()->GetController().GetLastCommittedEntry(); |
| 133 ASSERT_TRUE(entry != NULL); | 133 ASSERT_TRUE(entry != NULL); |
| 134 EXPECT_EQ(url_rewritten, entry->GetURL()); | 134 EXPECT_EQ(url_rewritten, entry->GetURL()); |
| 135 EXPECT_EQ(url_original, entry->GetVirtualURL()); | 135 EXPECT_EQ(url_original, entry->GetVirtualURL()); |
| 136 } | 136 } |
| 137 | 137 |
| 138 } // namespace content | 138 } // namespace content |
| 139 #endif // !defined(OS_IOS) && !defined(OS_ANDROID) | 139 #endif // !defined(OS_IOS) && !defined(OS_ANDROID) |
| OLD | NEW |