| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "chrome/browser/profile_manager.h" | 8 #include "chrome/browser/profile_manager.h" |
| 9 #include "chrome/browser/history/history.h" | 9 #include "chrome/browser/history/history.h" |
| 10 #include "chrome/browser/sessions/session_service.h" | 10 #include "chrome/browser/sessions/session_service.h" |
| 11 #include "chrome/browser/sessions/session_service_test_helper.h" | 11 #include "chrome/browser/sessions/session_service_test_helper.h" |
| 12 #include "chrome/browser/sessions/session_types.h" | 12 #include "chrome/browser/sessions/session_types.h" |
| 13 #include "chrome/browser/tab_contents/navigation_controller.h" | 13 #include "chrome/browser/tab_contents/navigation_controller.h" |
| 14 #include "chrome/browser/tab_contents/navigation_entry.h" | 14 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 15 #include "chrome/browser/tab_contents/tab_contents.h" | 15 #include "chrome/browser/tab_contents/tab_contents.h" |
| 16 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 16 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
| 17 #include "chrome/browser/tab_contents/tab_contents_factory.h" | 17 #include "chrome/browser/tab_contents/tab_contents_factory.h" |
| 18 #include "chrome/common/notification_registrar.h" | 18 #include "chrome/common/notification_registrar.h" |
| 19 #include "chrome/common/notification_service.h" | 19 #include "chrome/common/notification_service.h" |
| 20 #include "chrome/common/render_messages.h" |
| 20 #include "chrome/common/stl_util-inl.h" | 21 #include "chrome/common/stl_util-inl.h" |
| 21 #include "chrome/test/test_notification_tracker.h" | 22 #include "chrome/test/test_notification_tracker.h" |
| 22 #include "chrome/test/test_tab_contents.h" | 23 #include "chrome/test/test_tab_contents.h" |
| 23 #include "chrome/test/testing_profile.h" | 24 #include "chrome/test/testing_profile.h" |
| 24 #include "net/base/net_util.h" | 25 #include "net/base/net_util.h" |
| 25 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
| 26 | 27 |
| 27 using base::Time; | 28 using base::Time; |
| 28 | 29 |
| 29 namespace { | 30 namespace { |
| (...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1634 | 1635 |
| 1635 helper_.AssertSingleWindowWithSingleTab(windows_, 2); | 1636 helper_.AssertSingleWindowWithSingleTab(windows_, 2); |
| 1636 helper_.AssertTabEquals(0, 1, 2, *(windows_[0]->tabs[0])); | 1637 helper_.AssertTabEquals(0, 1, 2, *(windows_[0]->tabs[0])); |
| 1637 | 1638 |
| 1638 TabNavigation nav(0, url0, GURL(), std::wstring(), std::string(), | 1639 TabNavigation nav(0, url0, GURL(), std::wstring(), std::string(), |
| 1639 PageTransition::LINK); | 1640 PageTransition::LINK); |
| 1640 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[0]); | 1641 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[0]); |
| 1641 nav.set_url(url2); | 1642 nav.set_url(url2); |
| 1642 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[1]); | 1643 helper_.AssertNavigationEquals(nav, windows_[0]->tabs[0]->navigations[1]); |
| 1643 } | 1644 } |
| OLD | NEW |