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

Side by Side Diff: chrome/browser/sync/profile_sync_service_session_unittest.cc

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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) 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ASSERT_EQ(1U, tab->navigations.size()); 132 ASSERT_EQ(1U, tab->navigations.size());
133 ASSERT_EQ(1, tab->tab_visual_index); 133 ASSERT_EQ(1, tab->tab_visual_index);
134 ASSERT_EQ(0, tab->current_navigation_index); 134 ASSERT_EQ(0, tab->current_navigation_index);
135 ASSERT_TRUE(tab->pinned); 135 ASSERT_TRUE(tab->pinned);
136 ASSERT_EQ("app_id", tab->extension_app_id); 136 ASSERT_EQ("app_id", tab->extension_app_id);
137 ASSERT_EQ(1U, tab->navigations.size()); 137 ASSERT_EQ(1U, tab->navigations.size());
138 ASSERT_EQ(12, tab->navigations[0].index()); 138 ASSERT_EQ(12, tab->navigations[0].index());
139 ASSERT_EQ(tab->navigations[0].virtual_url(), GURL("http://foo/1")); 139 ASSERT_EQ(tab->navigations[0].virtual_url(), GURL("http://foo/1"));
140 ASSERT_EQ(tab->navigations[0].referrer(), GURL("referrer")); 140 ASSERT_EQ(tab->navigations[0].referrer(), GURL("referrer"));
141 ASSERT_EQ(tab->navigations[0].title(), string16(ASCIIToUTF16("title"))); 141 ASSERT_EQ(tab->navigations[0].title(), string16(ASCIIToUTF16("title")));
142 ASSERT_EQ(tab->navigations[0].transition(), PageTransition::TYPED); 142 ASSERT_EQ(tab->navigations[0].transition(),
143 content::PAGE_TRANSITION_TYPED);
143 } 144 }
144 } 145 }
145 } 146 }
146 147
147 } // namespace 148 } // namespace
148 149
149 class ProfileSyncServiceSessionTest 150 class ProfileSyncServiceSessionTest
150 : public BrowserWithTestWindowTest, 151 : public BrowserWithTestWindowTest,
151 public NotificationObserver { 152 public NotificationObserver {
152 public: 153 public:
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 session_reference.push_back(tab_list1); 789 session_reference.push_back(tab_list1);
789 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0])); 790 VerifySyncedSession(tag, session_reference, *(foreign_sessions[0]));
790 791
791 // Now delete the foreign session. 792 // Now delete the foreign session.
792 model_associator_->DeleteForeignSession(tag); 793 model_associator_->DeleteForeignSession(tag);
793 ASSERT_FALSE(model_associator_->GetAllForeignSessions(&foreign_sessions)); 794 ASSERT_FALSE(model_associator_->GetAllForeignSessions(&foreign_sessions));
794 795
795 } 796 }
796 797
797 } // namespace browser_sync 798 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698