OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 #include "chrome/browser/ui/browser_window.h" | 36 #include "chrome/browser/ui/browser_window.h" |
37 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 37 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
38 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
39 #include "chrome/common/url_constants.h" | 39 #include "chrome/common/url_constants.h" |
40 #include "chrome/test/base/in_process_browser_test.h" | 40 #include "chrome/test/base/in_process_browser_test.h" |
41 #include "chrome/test/base/ui_test_utils.h" | 41 #include "chrome/test/base/ui_test_utils.h" |
42 #include "components/sessions/content/content_live_tab.h" | 42 #include "components/sessions/content/content_live_tab.h" |
43 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" | 43 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" |
44 #include "components/sessions/core/session_types.h" | 44 #include "components/sessions/core/session_types.h" |
45 #include "components/sessions/core/tab_restore_service.h" | 45 #include "components/sessions/core/tab_restore_service.h" |
| 46 #include "components/sync/protocol/session_specifics.pb.h" |
46 #include "content/public/browser/navigation_controller.h" | 47 #include "content/public/browser/navigation_controller.h" |
47 #include "content/public/browser/navigation_entry.h" | 48 #include "content/public/browser/navigation_entry.h" |
48 #include "content/public/browser/notification_service.h" | 49 #include "content/public/browser/notification_service.h" |
49 #include "content/public/browser/notification_types.h" | 50 #include "content/public/browser/notification_types.h" |
50 #include "content/public/browser/render_process_host.h" | 51 #include "content/public/browser/render_process_host.h" |
51 #include "content/public/browser/render_view_host.h" | 52 #include "content/public/browser/render_view_host.h" |
52 #include "content/public/browser/web_contents.h" | 53 #include "content/public/browser/web_contents.h" |
53 #include "content/public/common/bindings_policy.h" | 54 #include "content/public/common/bindings_policy.h" |
54 #include "content/public/test/browser_test_utils.h" | 55 #include "content/public/test/browser_test_utils.h" |
55 #include "content/public/test/test_navigation_observer.h" | 56 #include "content/public/test/test_navigation_observer.h" |
56 #include "net/test/embedded_test_server/embedded_test_server.h" | 57 #include "net/test/embedded_test_server/embedded_test_server.h" |
57 #include "sync/protocol/session_specifics.pb.h" | |
58 #include "ui/base/page_transition_types.h" | 58 #include "ui/base/page_transition_types.h" |
59 | 59 |
60 #if defined(OS_MACOSX) | 60 #if defined(OS_MACOSX) |
61 #include "base/mac/scoped_nsautorelease_pool.h" | 61 #include "base/mac/scoped_nsautorelease_pool.h" |
62 #endif | 62 #endif |
63 | 63 |
64 #if defined(USE_AURA) | 64 #if defined(USE_AURA) |
65 #include "ui/aura/window.h" | 65 #include "ui/aura/window.h" |
66 #endif | 66 #endif |
67 | 67 |
(...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1469 // automatically at the start of the test. | 1469 // automatically at the start of the test. |
1470 for (size_t i = 1; i < web_contents().size(); i++) { | 1470 for (size_t i = 1; i < web_contents().size(); i++) { |
1471 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); | 1471 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); |
1472 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); | 1472 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); |
1473 if (i > 0) { | 1473 if (i > 0) { |
1474 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), | 1474 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), |
1475 web_contents()[i]->GetLastActiveTime()); | 1475 web_contents()[i]->GetLastActiveTime()); |
1476 } | 1476 } |
1477 } | 1477 } |
1478 } | 1478 } |
OLD | NEW |