OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 5 #include <map> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 #include "content/test/test_browser_thread.h" | 44 #include "content/test/test_browser_thread.h" |
45 #include "googleurl/src/gurl.h" | 45 #include "googleurl/src/gurl.h" |
46 #include "testing/gmock/include/gmock/gmock.h" | 46 #include "testing/gmock/include/gmock/gmock.h" |
47 #include "testing/gtest/include/gtest/gtest.h" | 47 #include "testing/gtest/include/gtest/gtest.h" |
48 #include "ui/base/ui_base_types.h" | 48 #include "ui/base/ui_base_types.h" |
49 | 49 |
50 using browser_sync::SessionChangeProcessor; | 50 using browser_sync::SessionChangeProcessor; |
51 using browser_sync::SessionDataTypeController; | 51 using browser_sync::SessionDataTypeController; |
52 using browser_sync::SessionModelAssociator; | 52 using browser_sync::SessionModelAssociator; |
53 using browser_sync::SyncBackendHost; | 53 using browser_sync::SyncBackendHost; |
| 54 using content::BrowserThread; |
54 using sync_api::ChangeRecord; | 55 using sync_api::ChangeRecord; |
55 using testing::_; | 56 using testing::_; |
56 using testing::Return; | 57 using testing::Return; |
57 using browser_sync::TestIdFactory; | 58 using browser_sync::TestIdFactory; |
58 | 59 |
59 namespace browser_sync { | 60 namespace browser_sync { |
60 | 61 |
61 namespace { | 62 namespace { |
62 | 63 |
63 void BuildSessionSpecifics(const std::string& tag, | 64 void BuildSessionSpecifics(const std::string& tag, |
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
895 // Verify the now non-stale session does not get deleted. | 896 // Verify the now non-stale session does not get deleted. |
896 model_associator_->DeleteStaleSessions(); | 897 model_associator_->DeleteStaleSessions(); |
897 ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions)); | 898 ASSERT_TRUE(model_associator_->GetAllForeignSessions(&foreign_sessions)); |
898 ASSERT_EQ(1U, foreign_sessions.size()); | 899 ASSERT_EQ(1U, foreign_sessions.size()); |
899 std::vector<std::vector<SessionID::id_type> > session_reference; | 900 std::vector<std::vector<SessionID::id_type> > session_reference; |
900 session_reference.push_back(tab_list1); | 901 session_reference.push_back(tab_list1); |
901 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); | 902 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); |
902 } | 903 } |
903 | 904 |
904 } // namespace browser_sync | 905 } // namespace browser_sync |
OLD | NEW |