| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser.h" | |
| 6 #include "chrome/browser/browser_list.h" | 5 #include "chrome/browser/browser_list.h" |
| 7 #include "chrome/browser/browser_window.h" | 6 #include "chrome/browser/browser_window.h" |
| 8 #include "chrome/browser/profile.h" | 7 #include "chrome/browser/profile.h" |
| 9 #include "chrome/browser/tab_contents/tab_contents.h" | 8 #include "chrome/browser/tab_contents/tab_contents.h" |
| 10 #include "chrome/browser/tab_contents/tab_contents_view.h" | 9 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 11 #include "chrome/browser/tabs/tab_strip_model.h" | 10 #include "chrome/browser/tabs/tab_strip_model.h" |
| 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_navigator.h" | 12 #include "chrome/browser/ui/browser_navigator.h" |
| 13 #include "chrome/test/in_process_browser_test.h" | 13 #include "chrome/test/in_process_browser_test.h" |
| 14 #include "chrome/test/ui_test_utils.h" | 14 #include "chrome/test/ui_test_utils.h" |
| 15 #include "ipc/ipc_message.h" | 15 #include "ipc/ipc_message.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 class BrowserNavigatorTest : public InProcessBrowserTest { | 19 class BrowserNavigatorTest : public InProcessBrowserTest { |
| 20 protected: | 20 protected: |
| 21 GURL GetGoogleURL() const { | 21 GURL GetGoogleURL() const { |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 | 458 |
| 459 // We should now have two windows, the browser() provided by the framework and | 459 // We should now have two windows, the browser() provided by the framework and |
| 460 // the new normal window. | 460 // the new normal window. |
| 461 EXPECT_EQ(2u, BrowserList::size()); | 461 EXPECT_EQ(2u, BrowserList::size()); |
| 462 EXPECT_EQ(1, browser()->tab_count()); | 462 EXPECT_EQ(1, browser()->tab_count()); |
| 463 EXPECT_EQ(1, p.browser->tab_count()); | 463 EXPECT_EQ(1, p.browser->tab_count()); |
| 464 } | 464 } |
| 465 | 465 |
| 466 | 466 |
| 467 } // namespace | 467 } // namespace |
| OLD | NEW |