| 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 "base/base_switches.h" | 5 #include "base/base_switches.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/net/prediction_options.h" | 8 #include "chrome/browser/net/prediction_options.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 { | 133 { |
| 134 scoped_ptr<NetworkChangeNotifier> mock(new MockNetworkChangeNotifier4G); | 134 scoped_ptr<NetworkChangeNotifier> mock(new MockNetworkChangeNotifier4G); |
| 135 EXPECT_TRUE(RunPrefetchExperiment(false, browser())); | 135 EXPECT_TRUE(RunPrefetchExperiment(false, browser())); |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 | 138 |
| 139 // Bug 339909: When in incognito mode the browser crashed due to an | 139 // Bug 339909: When in incognito mode the browser crashed due to an |
| 140 // uninitialized preference member. Verify that it no longer does. | 140 // uninitialized preference member. Verify that it no longer does. |
| 141 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPrediction, IncognitoTest) { | 141 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestPrediction, IncognitoTest) { |
| 142 Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile(); | 142 Profile* incognito_profile = browser()->profile()->GetOffTheRecordProfile(); |
| 143 Browser* incognito_browser = new Browser( | 143 Browser* incognito_browser = |
| 144 Browser::CreateParams(incognito_profile, browser()->host_desktop_type())); | 144 new Browser(Browser::CreateParams(incognito_profile)); |
| 145 | 145 |
| 146 // Navigate just to have a tab in this window, otherwise there is no | 146 // Navigate just to have a tab in this window, otherwise there is no |
| 147 // WebContents for the incognito browser. | 147 // WebContents for the incognito browser. |
| 148 OpenURLOffTheRecord(browser()->profile(), GURL("about:blank")); | 148 OpenURLOffTheRecord(browser()->profile(), GURL("about:blank")); |
| 149 | 149 |
| 150 EXPECT_TRUE(RunPrefetchExperiment(true, incognito_browser)); | 150 EXPECT_TRUE(RunPrefetchExperiment(true, incognito_browser)); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace | 153 } // namespace |
| OLD | NEW |