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_factory.h" | 9 #include "chrome/browser/search_engines/template_url_service_factory.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 EXPECT_FALSE(to_command_line_.HasSwitch(switches::kDisableWebRtcEncryption)); | 86 EXPECT_FALSE(to_command_line_.HasSwitch(switches::kDisableWebRtcEncryption)); |
87 } | 87 } |
88 | 88 |
89 } // namespace chrome | 89 } // namespace chrome |
90 | 90 |
91 #if !defined(OS_IOS) && !defined(OS_ANDROID) | 91 #if !defined(OS_IOS) && !defined(OS_ANDROID) |
92 namespace content { | 92 namespace content { |
93 | 93 |
94 class InstantNTPURLRewriteTest : public BrowserWithTestWindowTest { | 94 class InstantNTPURLRewriteTest : public BrowserWithTestWindowTest { |
95 protected: | 95 protected: |
96 virtual void SetUp() OVERRIDE { | 96 virtual void SetUp() override { |
97 BrowserWithTestWindowTest::SetUp(); | 97 BrowserWithTestWindowTest::SetUp(); |
98 field_trial_list_.reset(new base::FieldTrialList( | 98 field_trial_list_.reset(new base::FieldTrialList( |
99 new metrics::SHA1EntropyProvider("42"))); | 99 new metrics::SHA1EntropyProvider("42"))); |
100 } | 100 } |
101 | 101 |
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()); |
(...skipping 23 matching lines...) Expand all Loading... |
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 |