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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/memory/memory_pressure_listener.h" | 9 #include "base/memory/memory_pressure_listener.h" |
10 #include "base/process/launch.h" | 10 #include "base/process/launch.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 #include "content/public/browser/notification_service.h" | 41 #include "content/public/browser/notification_service.h" |
42 #include "content/public/browser/notification_types.h" | 42 #include "content/public/browser/notification_types.h" |
43 #include "content/public/browser/render_process_host.h" | 43 #include "content/public/browser/render_process_host.h" |
44 #include "content/public/browser/render_view_host.h" | 44 #include "content/public/browser/render_view_host.h" |
45 #include "content/public/browser/web_contents.h" | 45 #include "content/public/browser/web_contents.h" |
46 #include "content/public/common/bindings_policy.h" | 46 #include "content/public/common/bindings_policy.h" |
47 #include "content/public/test/browser_test_utils.h" | 47 #include "content/public/test/browser_test_utils.h" |
48 #include "content/public/test/test_navigation_observer.h" | 48 #include "content/public/test/test_navigation_observer.h" |
49 #include "sync/protocol/session_specifics.pb.h" | 49 #include "sync/protocol/session_specifics.pb.h" |
50 #include "ui/base/page_transition_types.h" | 50 #include "ui/base/page_transition_types.h" |
| 51 #include "ui/gfx/host_desktop_type.h" |
51 | 52 |
52 using sessions::SerializedNavigationEntry; | 53 using sessions::SerializedNavigationEntry; |
53 using sessions::SerializedNavigationEntryTestHelper; | 54 using sessions::SerializedNavigationEntryTestHelper; |
54 | 55 |
55 #if defined(OS_MACOSX) | 56 #if defined(OS_MACOSX) |
56 #include "base/mac/scoped_nsautorelease_pool.h" | 57 #include "base/mac/scoped_nsautorelease_pool.h" |
57 #endif | 58 #endif |
58 | 59 |
59 #if defined(USE_AURA) | 60 #if defined(USE_AURA) |
60 #include "ui/aura/window.h" | 61 #include "ui/aura/window.h" |
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1504 // automatically at the start of the test. | 1505 // automatically at the start of the test. |
1505 for (size_t i = 1; i < web_contents().size(); i++) { | 1506 for (size_t i = 1; i < web_contents().size(); i++) { |
1506 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); | 1507 GURL expected_url = GURL(kUrls[activation_order[kExpectedNumTabs - i]]); |
1507 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); | 1508 ASSERT_EQ(expected_url, web_contents()[i]->GetLastCommittedURL()); |
1508 if (i > 0) { | 1509 if (i > 0) { |
1509 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), | 1510 ASSERT_GT(web_contents()[i - 1]->GetLastActiveTime(), |
1510 web_contents()[i]->GetLastActiveTime()); | 1511 web_contents()[i]->GetLastActiveTime()); |
1511 } | 1512 } |
1512 } | 1513 } |
1513 } | 1514 } |
OLD | NEW |