| 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 11 #include "base/string_util.h" | 11 #include "base/strings/string_util.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #include "base/time.h" | 13 #include "base/time.h" |
| 14 // These are only used for commented out tests. If someone wants to enable | 14 // These are only used for commented out tests. If someone wants to enable |
| 15 // them, they should be moved to chrome first. | 15 // them, they should be moved to chrome first. |
| 16 // #include "chrome/browser/history/history_service.h" | 16 // #include "chrome/browser/history/history_service.h" |
| 17 // #include "chrome/browser/profiles/profile_manager.h" | 17 // #include "chrome/browser/profiles/profile_manager.h" |
| 18 // #include "chrome/browser/sessions/session_service.h" | 18 // #include "chrome/browser/sessions/session_service.h" |
| 19 // #include "chrome/browser/sessions/session_service_factory.h" | 19 // #include "chrome/browser/sessions/session_service_factory.h" |
| 20 // #include "chrome/browser/sessions/session_service_test_helper.h" | 20 // #include "chrome/browser/sessions/session_service_test_helper.h" |
| 21 // #include "chrome/browser/sessions/session_types.h" | 21 // #include "chrome/browser/sessions/session_types.h" |
| (...skipping 3858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3880 PAGE_TRANSITION_LINK); | 3880 PAGE_TRANSITION_LINK); |
| 3881 session_helper_.AssertNavigationEquals(nav, | 3881 session_helper_.AssertNavigationEquals(nav, |
| 3882 windows_[0]->tabs[0]->navigations[0]); | 3882 windows_[0]->tabs[0]->navigations[0]); |
| 3883 nav.set_url(url2); | 3883 nav.set_url(url2); |
| 3884 session_helper_.AssertNavigationEquals(nav, | 3884 session_helper_.AssertNavigationEquals(nav, |
| 3885 windows_[0]->tabs[0]->navigations[1]); | 3885 windows_[0]->tabs[0]->navigations[1]); |
| 3886 } | 3886 } |
| 3887 */ | 3887 */ |
| 3888 | 3888 |
| 3889 } // namespace content | 3889 } // namespace content |
| OLD | NEW |