Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: chrome/browser/sync/glue/session_model_associator_unittest.cc

Issue 10382183: [Sync] Move PageTransitions enums to SyncEnums (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/sessions/session_types.h" 10 #include "chrome/browser/sessions/session_types.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 sync_pb::SessionTab tab_s; 163 sync_pb::SessionTab tab_s;
164 tab_s.set_tab_id(5); 164 tab_s.set_tab_id(5);
165 tab_s.set_tab_visual_index(13); 165 tab_s.set_tab_visual_index(13);
166 tab_s.set_current_navigation_index(3); 166 tab_s.set_current_navigation_index(3);
167 tab_s.set_pinned(true); 167 tab_s.set_pinned(true);
168 tab_s.set_extension_app_id("app_id"); 168 tab_s.set_extension_app_id("app_id");
169 sync_pb::TabNavigation* navigation = tab_s.add_navigation(); 169 sync_pb::TabNavigation* navigation = tab_s.add_navigation();
170 navigation->set_virtual_url("http://foo/1"); 170 navigation->set_virtual_url("http://foo/1");
171 navigation->set_referrer("referrer"); 171 navigation->set_referrer("referrer");
172 navigation->set_title("title"); 172 navigation->set_title("title");
173 navigation->set_page_transition(sync_pb::TabNavigation_PageTransition_TYPED); 173 navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
174 174
175 SyncedSessionTab tab; 175 SyncedSessionTab tab;
176 tab.tab_id.set_id(5); // Expected to be set by the SyncedSessionTracker. 176 tab.tab_id.set_id(5); // Expected to be set by the SyncedSessionTracker.
177 SessionModelAssociator::PopulateSessionTabFromSpecifics( 177 SessionModelAssociator::PopulateSessionTabFromSpecifics(
178 tab_s, base::Time(), &tab); 178 tab_s, base::Time(), &tab);
179 ASSERT_EQ(5, tab.tab_id.id()); 179 ASSERT_EQ(5, tab.tab_id.id());
180 ASSERT_EQ(13, tab.tab_visual_index); 180 ASSERT_EQ(13, tab.tab_visual_index);
181 ASSERT_EQ(3, tab.current_navigation_index); 181 ASSERT_EQ(3, tab.current_navigation_index);
182 ASSERT_TRUE(tab.pinned); 182 ASSERT_TRUE(tab.pinned);
183 ASSERT_EQ("app_id", tab.extension_app_id); 183 ASSERT_EQ("app_id", tab.extension_app_id);
(...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 sync_tab.navigation(2).virtual_url()); 830 sync_tab.navigation(2).virtual_url());
831 EXPECT_EQ(1, sync_tab.current_navigation_index()); 831 EXPECT_EQ(1, sync_tab.current_navigation_index());
832 EXPECT_EQ(2, sync_tab.navigation(0).timestamp()); 832 EXPECT_EQ(2, sync_tab.navigation(0).timestamp());
833 EXPECT_LE(now, sync_tab.navigation(1).timestamp()); 833 EXPECT_LE(now, sync_tab.navigation(1).timestamp());
834 EXPECT_LE(now, sync_tab.navigation(2).timestamp()); 834 EXPECT_LE(now, sync_tab.navigation(2).timestamp());
835 EXPECT_EQ(3U, prev_tab.navigations.size()); 835 EXPECT_EQ(3U, prev_tab.navigations.size());
836 EXPECT_EQ(3U, prev_tab.synced_tab_navigations.size()); 836 EXPECT_EQ(3U, prev_tab.synced_tab_navigations.size());
837 } 837 }
838 838
839 } // namespace browser_sync 839 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/session_model_associator.cc ('k') | chrome/browser/sync/profile_sync_service_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698