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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/tab_contents/navigation_controller_unittest.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
« no previous file with comments | « content/browser/tab_contents/navigation_controller.cc ('k') | content/browser/tab_contents/render_view_host_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/navigation_controller_unittest.cc
===================================================================
--- content/browser/tab_contents/navigation_controller_unittest.cc (revision 91968)
+++ content/browser/tab_contents/navigation_controller_unittest.cc (working copy)
@@ -43,11 +43,11 @@
void RegisterForAllNavNotifications(TestNotificationTracker* tracker,
NavigationController* controller) {
- tracker->ListenFor(NotificationType::NAV_ENTRY_COMMITTED,
+ tracker->ListenFor(content::NOTIFICATION_NAV_ENTRY_COMMITTED,
Source<NavigationController>(controller));
- tracker->ListenFor(NotificationType::NAV_LIST_PRUNED,
+ tracker->ListenFor(content::NOTIFICATION_NAV_LIST_PRUNED,
Source<NavigationController>(controller));
- tracker->ListenFor(NotificationType::NAV_ENTRY_CHANGED,
+ tracker->ListenFor(content::NOTIFICATION_NAV_ENTRY_CHANGED,
Source<NavigationController>(controller));
}
@@ -110,7 +110,7 @@
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// The load should now be committed.
EXPECT_EQ(controller().entry_count(), 1);
@@ -141,7 +141,7 @@
rvh()->SendShouldCloseACK(true);
contents()->pending_rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// The load should now be committed.
EXPECT_EQ(controller().entry_count(), 2);
@@ -168,13 +168,13 @@
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().LoadURL(url1, GURL(), PageTransition::TYPED);
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// We should not have produced a new session history entry.
EXPECT_EQ(controller().entry_count(), 1);
@@ -198,7 +198,7 @@
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().LoadURL(url2, GURL(), PageTransition::TYPED);
controller().DiscardNonCommittedEntries();
@@ -226,7 +226,7 @@
PageTransition::TYPED);
rvh()->SendNavigate(0, kExistingURL1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Do a new navigation without making a pending one.
const GURL kNewURL("http://see");
@@ -235,7 +235,7 @@
// There should no longer be any pending entry, and the third navigation we
// just made should be committed.
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(-1, controller().pending_entry_index());
EXPECT_EQ(1, controller().last_committed_entry_index());
EXPECT_EQ(kNewURL, controller().GetActiveEntry()->url());
@@ -255,7 +255,7 @@
PageTransition::TYPED);
rvh()->SendNavigate(0, kExistingURL1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Make a pending entry to somewhere new.
const GURL kExistingURL2("http://bee");
@@ -271,7 +271,7 @@
// There should no longer be any pending entry, and the third navigation we
// just made should be committed.
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(-1, controller().pending_entry_index());
EXPECT_EQ(1, controller().last_committed_entry_index());
EXPECT_EQ(kNewURL, controller().GetActiveEntry()->url());
@@ -290,14 +290,14 @@
PageTransition::TYPED);
rvh()->SendNavigate(0, kExistingURL1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
const GURL kExistingURL2("http://foo/bee");
controller().LoadURL(kExistingURL2, GURL(),
PageTransition::TYPED);
rvh()->SendNavigate(1, kExistingURL2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Now make a pending back/forward navigation. The zeroth entry should be
// pending.
@@ -314,7 +314,7 @@
// There should no longer be any pending entry, and the third navigation we
// just made should be committed.
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(-1, controller().pending_entry_index());
EXPECT_EQ(2, controller().last_committed_entry_index());
EXPECT_EQ(kNewURL, controller().GetActiveEntry()->url());
@@ -332,13 +332,13 @@
controller().LoadURL(kExistingURL1, GURL(), PageTransition::TYPED);
rvh()->SendNavigate(0, kExistingURL1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
const GURL kExistingURL2("http://foo/bee");
controller().LoadURL(kExistingURL2, GURL(), PageTransition::TYPED);
rvh()->SendNavigate(1, kExistingURL2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Now make a pending new navigation.
const GURL kNewURL("http://foo/see");
@@ -353,7 +353,7 @@
// There should no longer be any pending entry, and the back navigation we
// just made should be committed.
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(-1, controller().pending_entry_index());
EXPECT_EQ(0, controller().last_committed_entry_index());
EXPECT_EQ(kExistingURL1, controller().GetActiveEntry()->url());
@@ -505,7 +505,7 @@
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().Reload(true);
EXPECT_EQ(0U, notifications.size());
@@ -521,7 +521,7 @@
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Now the reload is committed.
EXPECT_EQ(controller().entry_count(), 1);
@@ -544,14 +544,14 @@
controller().LoadURL(url1, GURL(), PageTransition::TYPED);
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().Reload(true);
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Now the reload is committed.
EXPECT_EQ(controller().entry_count(), 2);
@@ -571,12 +571,12 @@
const GURL url1("http://foo1");
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
const GURL url2("http://foo2");
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().GoBack();
EXPECT_EQ(0U, notifications.size());
@@ -592,7 +592,7 @@
rvh()->SendNavigate(0, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// The back navigation completed successfully.
EXPECT_EQ(controller().entry_count(), 2);
@@ -616,12 +616,12 @@
controller().LoadURL(url1, GURL(), PageTransition::TYPED);
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().LoadURL(url2, GURL(), PageTransition::TYPED);
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().GoBack();
EXPECT_EQ(0U, notifications.size());
@@ -637,7 +637,7 @@
rvh()->SendNavigate(2, url3);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// The back navigation resulted in a completely new navigation.
// TODO(darin): perhaps this behavior will be confusing to users?
@@ -662,12 +662,12 @@
// First navigate two places so we have some back history.
rvh()->SendNavigate(0, kUrl1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// controller().LoadURL(kUrl2, PageTransition::TYPED);
rvh()->SendNavigate(1, kUrl2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Now start a new pending navigation and go back before it commits.
controller().LoadURL(kUrl3, GURL(), PageTransition::TYPED);
@@ -738,16 +738,16 @@
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().GoBack();
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().GoForward();
@@ -762,7 +762,7 @@
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// The forward navigation completed successfully.
EXPECT_EQ(controller().entry_count(), 2);
@@ -785,15 +785,15 @@
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().GoBack();
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
controller().GoForward();
EXPECT_EQ(0U, notifications.size());
@@ -809,8 +809,8 @@
rvh()->SendNavigate(2, url3);
EXPECT_TRUE(notifications.Check2AndReset(
- NotificationType::NAV_LIST_PRUNED,
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_LIST_PRUNED,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(controller().entry_count(), 2);
EXPECT_EQ(controller().last_committed_entry_index(), 1);
@@ -836,7 +836,7 @@
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(0, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Second request
controller().LoadURL(url1, GURL(), PageTransition::TYPED);
@@ -861,7 +861,7 @@
EXPECT_EQ(0U, notifications.size());
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.type == NavigationType::SAME_PAGE);
EXPECT_EQ(controller().entry_count(), 1);
@@ -892,7 +892,7 @@
EXPECT_EQ(0U, notifications.size());
rvh()->SendNavigate(0, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Second request
controller().LoadURL(url1, GURL(), PageTransition::TYPED);
@@ -917,7 +917,7 @@
EXPECT_EQ(0U, notifications.size());
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.type == NavigationType::SAME_PAGE);
EXPECT_EQ(controller().entry_count(), 1);
@@ -963,7 +963,7 @@
EXPECT_EQ(0U, notifications.size());
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.type == NavigationType::NEW_PAGE);
EXPECT_EQ(controller().entry_count(), 1);
@@ -986,7 +986,7 @@
const GURL url1("http://foo1");
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
const GURL url2("http://foo2");
ViewHostMsg_FrameNavigate_Params params;
@@ -1001,7 +1001,7 @@
content::LoadCommittedDetails details;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(url1, details.previous_url);
EXPECT_FALSE(details.is_in_page);
EXPECT_FALSE(details.is_main_frame);
@@ -1047,7 +1047,7 @@
const GURL url1("http://foo1");
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
const GURL url2("http://foo2");
ViewHostMsg_FrameNavigate_Params params;
@@ -1077,7 +1077,7 @@
const GURL url1("http://foo1");
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// First manual subframe navigation.
const GURL url2("http://foo2");
@@ -1094,7 +1094,7 @@
content::LoadCommittedDetails details;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(2, controller().entry_count());
// Second manual subframe navigation should also make a new entry.
@@ -1103,7 +1103,7 @@
params.url = url3;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(3, controller().entry_count());
EXPECT_EQ(2, controller().GetCurrentEntryIndex());
@@ -1113,7 +1113,7 @@
params.page_id = 1;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(3, controller().entry_count());
EXPECT_EQ(1, controller().GetCurrentEntryIndex());
@@ -1123,7 +1123,7 @@
params.page_id = 0;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(3, controller().entry_count());
EXPECT_EQ(0, controller().GetCurrentEntryIndex());
}
@@ -1137,11 +1137,11 @@
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
rvh()->SendNavigate(1, url2);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// Should not have produced a new session history entry.
EXPECT_EQ(controller().entry_count(), 2);
@@ -1161,7 +1161,7 @@
const GURL url1("http://foo");
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// First navigation.
const GURL url2("http://foo#a");
@@ -1178,7 +1178,7 @@
content::LoadCommittedDetails details;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.is_in_page);
EXPECT_FALSE(details.did_replace_entry);
EXPECT_EQ(2, controller().entry_count());
@@ -1190,7 +1190,7 @@
back_params.page_id = 0;
EXPECT_TRUE(controller().RendererDidNavigate(back_params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// is_in_page is false in that case but should be true.
// See comment in AreURLsInPageNavigation() in navigation_controller.cc
// EXPECT_TRUE(details.is_in_page);
@@ -1205,7 +1205,7 @@
forward_params.page_id = 1;
EXPECT_TRUE(controller().RendererDidNavigate(forward_params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.is_in_page);
EXPECT_EQ(2, controller().entry_count());
EXPECT_EQ(1, controller().GetCurrentEntryIndex());
@@ -1230,7 +1230,7 @@
notifications.Reset();
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_FALSE(details.is_in_page);
}
@@ -1242,7 +1242,7 @@
const GURL url1("http://foo");
rvh()->SendNavigate(0, url1);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
// First navigation.
const GURL url2("http://foo#a");
@@ -1259,8 +1259,8 @@
content::LoadCommittedDetails details;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check2AndReset(
- NotificationType::NAV_LIST_PRUNED,
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_LIST_PRUNED,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.is_in_page);
EXPECT_TRUE(details.did_replace_entry);
EXPECT_EQ(1, controller().entry_count());
@@ -1281,7 +1281,7 @@
const GURL url("http://foo/");
rvh()->SendNavigate(0, url);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
}
// Navigate to a new page.
@@ -1290,7 +1290,7 @@
rvh()->SendNavigate(1, url);
controller().DocumentLoadedInFrame();
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
}
// Navigate within the page.
@@ -1310,8 +1310,8 @@
content::LoadCommittedDetails details;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check2AndReset(
- NotificationType::NAV_LIST_PRUNED,
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_LIST_PRUNED,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_TRUE(details.is_in_page);
EXPECT_TRUE(details.did_replace_entry);
EXPECT_EQ(2, controller().entry_count());
@@ -1335,7 +1335,7 @@
content::LoadCommittedDetails details;
EXPECT_TRUE(controller().RendererDidNavigate(params, &details));
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_FALSE(details.is_in_page);
EXPECT_EQ(3, controller().entry_count());
}
@@ -1346,25 +1346,25 @@
controller().GoBack();
rvh()->SendNavigate(1, url);
EXPECT_TRUE(notifications.Check1AndReset(
- NotificationType::NAV_ENTRY_COMMITTED));
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED));
EXPECT_EQ(url, controller().GetActiveEntry()->url());
}
}
// NotificationObserver implementation used in verifying we've received the
-// NotificationType::NAV_LIST_PRUNED method.
+// content::NOTIFICATION_NAV_LIST_PRUNED method.
class PrunedListener : public NotificationObserver {
public:
explicit PrunedListener(NavigationController* controller)
: notification_count_(0) {
- registrar_.Add(this, NotificationType::NAV_LIST_PRUNED,
+ registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED,
Source<NavigationController>(controller));
}
- virtual void Observe(NotificationType type,
+ virtual void Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
- if (type == NotificationType::NAV_LIST_PRUNED) {
+ if (type == content::NOTIFICATION_NAV_LIST_PRUNED) {
notification_count_++;
details_ = *(Details<content::PrunedDetails>(details).ptr());
}
« no previous file with comments | « content/browser/tab_contents/navigation_controller.cc ('k') | content/browser/tab_contents/render_view_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698