| 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 tab_iter != (*win_iter).end(); ++tab_iter, ++j) { | 132 tab_iter != (*win_iter).end(); ++tab_iter, ++j) { |
| 133 SessionTab* tab = win_ptr->tabs[j]; | 133 SessionTab* tab = win_ptr->tabs[j]; |
| 134 ASSERT_EQ(*tab_iter, tab->tab_id.id()); | 134 ASSERT_EQ(*tab_iter, tab->tab_id.id()); |
| 135 ASSERT_EQ(1U, tab->navigations.size()); | 135 ASSERT_EQ(1U, tab->navigations.size()); |
| 136 ASSERT_EQ(1, tab->tab_visual_index); | 136 ASSERT_EQ(1, tab->tab_visual_index); |
| 137 ASSERT_EQ(0, tab->current_navigation_index); | 137 ASSERT_EQ(0, tab->current_navigation_index); |
| 138 ASSERT_TRUE(tab->pinned); | 138 ASSERT_TRUE(tab->pinned); |
| 139 ASSERT_EQ("app_id", tab->extension_app_id); | 139 ASSERT_EQ("app_id", tab->extension_app_id); |
| 140 ASSERT_EQ(1U, tab->navigations.size()); | 140 ASSERT_EQ(1U, tab->navigations.size()); |
| 141 ASSERT_EQ(tab->navigations[0].virtual_url(), GURL("http://foo/1")); | 141 ASSERT_EQ(tab->navigations[0].virtual_url(), GURL("http://foo/1")); |
| 142 ASSERT_EQ(tab->navigations[0].referrer().url, GURL("referrer")); | 142 ASSERT_EQ(tab->navigations[0].GetReferrerForTest().url, GURL("referrer")); |
| 143 ASSERT_EQ(tab->navigations[0].title(), string16(ASCIIToUTF16("title"))); | 143 ASSERT_EQ(tab->navigations[0].title(), string16(ASCIIToUTF16("title"))); |
| 144 ASSERT_EQ(tab->navigations[0].transition(), | 144 ASSERT_EQ(tab->navigations[0].GetTransitionTypeForTest(), |
| 145 content::PAGE_TRANSITION_TYPED); | 145 content::PAGE_TRANSITION_TYPED); |
| 146 } | 146 } |
| 147 } | 147 } |
| 148 } | 148 } |
| 149 | 149 |
| 150 } // namespace | 150 } // namespace |
| 151 | 151 |
| 152 class ProfileSyncServiceSessionTest | 152 class ProfileSyncServiceSessionTest |
| 153 : public BrowserWithTestWindowTest, | 153 : public BrowserWithTestWindowTest, |
| 154 public content::NotificationObserver { | 154 public content::NotificationObserver { |
| (...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1195 sync_pb::SessionSpecifics specifics; | 1195 sync_pb::SessionSpecifics specifics; |
| 1196 header.SetSessionSpecifics(specifics); | 1196 header.SetSessionSpecifics(specifics); |
| 1197 } | 1197 } |
| 1198 // Ensure we associate properly despite the pre-existing node with our local | 1198 // Ensure we associate properly despite the pre-existing node with our local |
| 1199 // tag. | 1199 // tag. |
| 1200 error = model_associator_->AssociateModels(); | 1200 error = model_associator_->AssociateModels(); |
| 1201 ASSERT_FALSE(error.IsSet()); | 1201 ASSERT_FALSE(error.IsSet()); |
| 1202 } | 1202 } |
| 1203 | 1203 |
| 1204 } // namespace browser_sync | 1204 } // namespace browser_sync |
| OLD | NEW |