OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/prefs/pref_service.h" |
6 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
7 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
8 #include "chrome/browser/extensions/component_loader.h" | 9 #include "chrome/browser/extensions/component_loader.h" |
9 #include "chrome/browser/first_run/first_run.h" | 10 #include "chrome/browser/first_run/first_run.h" |
10 #include "chrome/browser/prefs/pref_service.h" | |
11 #include "chrome/browser/profiles/profile_manager.h" | 11 #include "chrome/browser/profiles/profile_manager.h" |
12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
15 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
16 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
17 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
18 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
19 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
20 #include "content/public/test/test_launcher.h" | 20 #include "content/public/test/test_launcher.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 ImportNothingAndShowNewTabPage) { | 134 ImportNothingAndShowNewTabPage) { |
135 ASSERT_TRUE(ProfileManager::DidPerformProfileImport()); | 135 ASSERT_TRUE(ProfileManager::DidPerformProfileImport()); |
136 ui_test_utils::NavigateToURLWithDisposition( | 136 ui_test_utils::NavigateToURLWithDisposition( |
137 browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB, | 137 browser(), GURL(chrome::kChromeUINewTabURL), CURRENT_TAB, |
138 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 138 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
139 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); | 139 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); |
140 EXPECT_EQ(1, tab->GetMaxPageID()); | 140 EXPECT_EQ(1, tab->GetMaxPageID()); |
141 } | 141 } |
142 | 142 |
143 #endif // !defined(OS_CHROMEOS) | 143 #endif // !defined(OS_CHROMEOS) |
OLD | NEW |