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

Side by Side 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 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
« no previous file with comments | « chrome/browser/sessions/base_session_service.cc ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/defaults.h" 17 #include "chrome/browser/defaults.h"
18 #include "chrome/browser/sessions/session_backend.h" 18 #include "chrome/browser/sessions/session_backend.h"
19 #include "chrome/browser/sessions/session_service.h" 19 #include "chrome/browser/sessions/session_service.h"
20 #include "chrome/browser/sessions/session_service_test_helper.h" 20 #include "chrome/browser/sessions/session_service_test_helper.h"
21 #include "chrome/browser/sessions/session_types.h" 21 #include "chrome/browser/sessions/session_types.h"
22 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
23 #include "chrome/common/url_constants.h"
23 #include "chrome/test/base/browser_with_test_window_test.h" 24 #include "chrome/test/base/browser_with_test_window_test.h"
24 #include "chrome/test/base/testing_profile.h" 25 #include "chrome/test/base/testing_profile.h"
25 #include "components/sessions/serialized_navigation_entry_test_helper.h" 26 #include "components/sessions/serialized_navigation_entry_test_helper.h"
26 #include "content/public/browser/navigation_entry.h" 27 #include "content/public/browser/navigation_entry.h"
27 #include "content/public/browser/notification_observer.h" 28 #include "content/public/browser/notification_observer.h"
28 #include "content/public/browser/notification_registrar.h" 29 #include "content/public/browser/notification_registrar.h"
29 #include "content/public/browser/notification_service.h" 30 #include "content/public/browser/notification_service.h"
30 #include "content/public/common/page_state.h" 31 #include "content/public/common/page_state.h"
31 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
32 33
(...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 service()->ScheduleCommand( 977 service()->ScheduleCommand(
977 service()->CreateSetActiveWindowCommand(window_id)); 978 service()->CreateSetActiveWindowCommand(window_id));
978 service()->ScheduleCommand( 979 service()->ScheduleCommand(
979 service()->CreateSetActiveWindowCommand(window2_id)); 980 service()->CreateSetActiveWindowCommand(window2_id));
980 981
981 ScopedVector<SessionWindow> windows; 982 ScopedVector<SessionWindow> windows;
982 SessionID::id_type active_window_id = 0; 983 SessionID::id_type active_window_id = 0;
983 ReadWindows(&(windows.get()), &active_window_id); 984 ReadWindows(&(windows.get()), &active_window_id);
984 EXPECT_EQ(window2_id.id(), active_window_id); 985 EXPECT_EQ(window2_id.id(), active_window_id);
985 } 986 }
987
988 // Makes sure we don't track blacklisted URLs.
989 TEST_F(SessionServiceTest, IgnoreBlacklistedUrls) {
990 SessionID tab_id;
991
992 SerializedNavigationEntry nav1 =
993 SerializedNavigationEntryTestHelper::CreateNavigation(
994 "http://google.com", "abc");
995 SerializedNavigationEntry nav2 =
996 SerializedNavigationEntryTestHelper::CreateNavigation(
997 chrome::kChromeUIQuitURL, "quit");
998 SerializedNavigationEntry nav3 =
999 SerializedNavigationEntryTestHelper::CreateNavigation(
1000 chrome::kChromeUIRestartURL, "restart");
1001
1002 helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
1003 UpdateNavigation(window_id, tab_id, nav1, true);
1004 UpdateNavigation(window_id, tab_id, nav2, true);
1005 UpdateNavigation(window_id, tab_id, nav3, true);
1006
1007 ScopedVector<SessionWindow> windows;
1008 ReadWindows(&(windows.get()), NULL);
1009
1010 ASSERT_EQ(1U, windows.size());
1011 ASSERT_EQ(0, windows[0]->selected_tab_index);
1012 ASSERT_EQ(window_id.id(), windows[0]->window_id.id());
1013 ASSERT_EQ(1U, windows[0]->tabs.size());
1014
1015 SessionTab* tab = windows[0]->tabs[0];
1016 helper_.AssertTabEquals(window_id, tab_id, 0, 0, 1, *tab);
1017 helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
1018 }
OLDNEW
« 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