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

Unified Diff: chrome/browser/sync/test/integration/sessions_helper.cc

Issue 10917231: Revamp TabNavigation class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix indent Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/sessions_helper.cc
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc
index ed4197432c1ab9756a516006a245457782a1178a..f7dd6eec8b7fffe3b5f5af521d1d849e6ec0ac07 100644
--- a/chrome/browser/sync/test/integration/sessions_helper.cc
+++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -16,8 +16,8 @@
#include "chrome/browser/sync/profile_sync_service_harness.h"
#include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
@@ -240,9 +240,9 @@ bool NavigationEquals(const TabNavigation& expected,
<< ", actual " << actual.virtual_url();
return false;
}
- if (expected.referrer().url != actual.referrer().url) {
- LOG(ERROR) << "Expected referrer " << expected.referrer().url
- << ", actual " << actual.referrer().url;
+ if (expected.GetReferrerForTest().url != actual.GetReferrerForTest().url) {
+ LOG(ERROR) << "Expected referrer " << expected.GetReferrerForTest().url
+ << ", actual " << actual.GetReferrerForTest().url;
return false;
}
if (expected.title() != actual.title()) {
@@ -250,9 +250,10 @@ bool NavigationEquals(const TabNavigation& expected,
<< ", actual " << actual.title();
return false;
}
- if (expected.transition() != actual.transition()) {
- LOG(ERROR) << "Expected transition " << expected.transition()
- << ", actual " << actual.transition();
+ if (expected.GetTransitionTypeForTest() !=
+ actual.GetTransitionTypeForTest()) {
+ LOG(ERROR) << "Expected transition " << expected.GetTransitionTypeForTest()
+ << ", actual " << actual.GetTransitionTypeForTest();
return false;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698