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/memory/scoped_vector.h" | 5 #include "base/memory/scoped_vector.h" |
6 #include "chrome/browser/sessions/session_service.h" | 6 #include "chrome/browser/sessions/session_service.h" |
7 #include "chrome/browser/sessions/session_types.h" | 7 #include "chrome/browser/sessions/session_types.h" |
8 #include "chrome/browser/sync/profile_sync_service.h" | 8 #include "chrome/browser/sync/profile_sync_service.h" |
9 #include "chrome/browser/sync/test/integration/sessions_helper.h" | 9 #include "chrome/browser/sync/test/integration/sessions_helper.h" |
10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 10 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
11 #include "chrome/browser/sync/test/integration/sync_test.h" | 11 #include "chrome/browser/sync/test/integration/sync_test.h" |
12 #include "chrome/browser/sync/test/integration/typed_urls_helper.h" | 12 #include "chrome/browser/sync/test/integration/typed_urls_helper.h" |
13 #include "components/history/core/browser/history_types.h" | 13 #include "components/history/core/browser/history_types.h" |
14 #include "sync/util/time.h" | 14 #include "sync/util/time.h" |
15 | 15 |
16 using sessions_helper::CheckInitialState; | 16 using sessions_helper::CheckInitialState; |
17 using sessions_helper::GetLocalWindows; | 17 using sessions_helper::GetLocalWindows; |
18 using sessions_helper::GetSessionData; | 18 using sessions_helper::GetSessionData; |
19 using sessions_helper::OpenTabAndGetLocalWindows; | 19 using sessions_helper::OpenTabAndGetLocalWindows; |
20 using sessions_helper::ScopedWindowMap; | 20 using sessions_helper::ScopedWindowMap; |
21 using sessions_helper::SessionWindowMap; | 21 using sessions_helper::SessionWindowMap; |
22 using sessions_helper::SyncedSessionVector; | 22 using sessions_helper::SyncedSessionVector; |
23 using sessions_helper::WindowsMatch; | 23 using sessions_helper::WindowsMatch; |
24 using sync_integration_test_util::AwaitCommitActivityCompletion; | 24 using sync_integration_test_util::AwaitCommitActivityCompletion; |
25 using typed_urls_helper::GetUrlFromClient; | 25 using typed_urls_helper::GetUrlFromClient; |
26 | 26 |
27 class SingleClientSessionsSyncTest : public SyncTest { | 27 class SingleClientSessionsSyncTest : public SyncTest { |
28 public: | 28 public: |
29 SingleClientSessionsSyncTest() : SyncTest(SINGLE_CLIENT) {} | 29 SingleClientSessionsSyncTest() : SyncTest(SINGLE_CLIENT) {} |
30 virtual ~SingleClientSessionsSyncTest() {} | 30 ~SingleClientSessionsSyncTest() override {} |
31 | 31 |
32 private: | 32 private: |
33 DISALLOW_COPY_AND_ASSIGN(SingleClientSessionsSyncTest); | 33 DISALLOW_COPY_AND_ASSIGN(SingleClientSessionsSyncTest); |
34 }; | 34 }; |
35 | 35 |
36 // Timeout on Windows, see http://crbug.com/99819 | 36 // Timeout on Windows, see http://crbug.com/99819 |
37 #if defined(OS_WIN) | 37 #if defined(OS_WIN) |
38 #define MAYBE_Sanity DISABLED_Sanity | 38 #define MAYBE_Sanity DISABLED_Sanity |
39 #else | 39 #else |
40 #define MAYBE_Sanity Sanity | 40 #define MAYBE_Sanity Sanity |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 for (std::vector<sessions::SerializedNavigationEntry>::const_iterator | 117 for (std::vector<sessions::SerializedNavigationEntry>::const_iterator |
118 it3 = (*it2)->navigations.begin(); | 118 it3 = (*it2)->navigations.begin(); |
119 it3 != (*it2)->navigations.end(); ++it3) { | 119 it3 != (*it2)->navigations.end(); ++it3) { |
120 EXPECT_EQ(200, it3->http_status_code()); | 120 EXPECT_EQ(200, it3->http_status_code()); |
121 ++found_navigations; | 121 ++found_navigations; |
122 } | 122 } |
123 } | 123 } |
124 } | 124 } |
125 ASSERT_EQ(1, found_navigations); | 125 ASSERT_EQ(1, found_navigations); |
126 } | 126 } |
OLD | NEW |