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

Unified Diff: chrome/browser/sessions/session_service_unittest.cc

Issue 84893002: Add chrome://quit to shut down Chrome, including packaged apps. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 | « chrome/browser/sessions/base_session_service.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/session_service_unittest.cc
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 75e4008d5086f1beeb5cabc54eee47b84804bdbb..775e52297951aeb6f9fc00b1fd6a37f068feda03 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/sessions/session_service_test_helper.h"
#include "chrome/browser/sessions/session_types.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/url_constants.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/testing_profile.h"
#include "components/sessions/serialized_navigation_entry_test_helper.h"
@@ -983,3 +984,35 @@ TEST_F(SessionServiceTest, RestoreActivation2) {
ReadWindows(&(windows.get()), &active_window_id);
EXPECT_EQ(window2_id.id(), active_window_id);
}
+
+// Makes sure we don't track blacklisted URLs.
+TEST_F(SessionServiceTest, IgnoreBlacklistedUrls) {
+ SessionID tab_id;
+
+ SerializedNavigationEntry nav1 =
+ SerializedNavigationEntryTestHelper::CreateNavigation(
+ "http://google.com", "abc");
+ SerializedNavigationEntry nav2 =
+ SerializedNavigationEntryTestHelper::CreateNavigation(
+ chrome::kChromeUIQuitURL, "quit");
+ SerializedNavigationEntry nav3 =
+ SerializedNavigationEntryTestHelper::CreateNavigation(
+ chrome::kChromeUIRestartURL, "restart");
+
+ helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
+ UpdateNavigation(window_id, tab_id, nav1, true);
+ UpdateNavigation(window_id, tab_id, nav2, true);
+ UpdateNavigation(window_id, tab_id, nav3, true);
+
+ ScopedVector<SessionWindow> windows;
+ ReadWindows(&(windows.get()), NULL);
+
+ ASSERT_EQ(1U, windows.size());
+ ASSERT_EQ(0, windows[0]->selected_tab_index);
+ ASSERT_EQ(window_id.id(), windows[0]->window_id.id());
+ ASSERT_EQ(1U, windows[0]->tabs.size());
+
+ SessionTab* tab = windows[0]->tabs[0];
+ helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);
+ helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
+}
« no previous file with comments | « chrome/browser/sessions/base_session_service.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698