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

Side by Side Diff: chrome/browser/sessions/persistent_tab_restore_service_unittest.cc

Issue 672083002: Refactoring of SessionService to get componentized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing windows compile problem Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/sessions/persistent_tab_restore_service.h" 5 #include "chrome/browser/sessions/persistent_tab_restore_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/threading/sequenced_worker_pool.h" 12 #include "base/threading/sequenced_worker_pool.h"
13 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/sessions/session_service.h" 14 #include "chrome/browser/sessions/session_service.h"
15 #include "chrome/browser/sessions/session_service_factory.h" 15 #include "chrome/browser/sessions/session_service_factory.h"
16 #include "chrome/browser/sessions/session_service_utils.h"
16 #include "chrome/browser/sessions/session_types.h" 17 #include "chrome/browser/sessions/session_types.h"
17 #include "chrome/browser/sessions/tab_restore_service_factory.h" 18 #include "chrome/browser/sessions/tab_restore_service_factory.h"
18 #include "chrome/browser/sessions/tab_restore_service_observer.h" 19 #include "chrome/browser/sessions/tab_restore_service_observer.h"
19 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
20 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 21 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
21 #include "chrome/test/base/chrome_render_view_test.h" 22 #include "chrome/test/base/chrome_render_view_test.h"
22 #include "chrome/test/base/testing_profile.h" 23 #include "chrome/test/base/testing_profile.h"
23 #include "components/sessions/serialized_navigation_entry_test_helper.h" 24 #include "components/sessions/serialized_navigation_entry_test_helper.h"
24 #include "content/public/browser/browser_thread.h" 25 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/navigation_controller.h" 26 #include "content/public/browser/navigation_controller.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 SynchronousLoadTabsFromLastSession(); 121 SynchronousLoadTabsFromLastSession();
121 } 122 }
122 123
123 // Adds a window with one tab and url to the profile's session service. 124 // Adds a window with one tab and url to the profile's session service.
124 // If |pinned| is true, the tab is marked as pinned in the session service. 125 // If |pinned| is true, the tab is marked as pinned in the session service.
125 void AddWindowWithOneTabToSessionService(bool pinned) { 126 void AddWindowWithOneTabToSessionService(bool pinned) {
126 SessionService* session_service = 127 SessionService* session_service =
127 SessionServiceFactory::GetForProfile(profile()); 128 SessionServiceFactory::GetForProfile(profile());
128 SessionID tab_id; 129 SessionID tab_id;
129 SessionID window_id; 130 SessionID window_id;
130 session_service->SetWindowType( 131 session_service->SetWindowType(window_id,
131 window_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL); 132 Browser::TYPE_TABBED,
133 SessionService::TYPE_NORMAL);
132 session_service->SetTabWindow(window_id, tab_id); 134 session_service->SetTabWindow(window_id, tab_id);
133 session_service->SetTabIndexInWindow(window_id, tab_id, 0); 135 session_service->SetTabIndexInWindow(window_id, tab_id, 0);
134 session_service->SetSelectedTabInWindow(window_id, 0); 136 session_service->SetSelectedTabInWindow(window_id, 0);
135 if (pinned) 137 if (pinned)
136 session_service->SetPinnedState(window_id, tab_id, true); 138 session_service->SetPinnedState(window_id, tab_id, true);
137 session_service->UpdateTabNavigation( 139 session_service->UpdateTabNavigation(
138 window_id, tab_id, 140 window_id, tab_id,
139 SerializedNavigationEntryTestHelper::CreateNavigation( 141 SerializedNavigationEntryTestHelper::CreateNavigation(
140 url1_.spec(), "title")); 142 url1_.spec(), "title"));
141 } 143 }
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 756
755 EXPECT_FALSE(service_->IsLoaded()); 757 EXPECT_FALSE(service_->IsLoaded());
756 TestTabRestoreServiceObserver observer; 758 TestTabRestoreServiceObserver observer;
757 service_->AddObserver(&observer); 759 service_->AddObserver(&observer);
758 EXPECT_EQ(max_entries, service_->entries().size()); 760 EXPECT_EQ(max_entries, service_->entries().size());
759 SynchronousLoadTabsFromLastSession(); 761 SynchronousLoadTabsFromLastSession();
760 EXPECT_TRUE(observer.got_loaded()); 762 EXPECT_TRUE(observer.got_loaded());
761 EXPECT_TRUE(service_->IsLoaded()); 763 EXPECT_TRUE(service_->IsLoaded());
762 service_->RemoveObserver(&observer); 764 service_->RemoveObserver(&observer);
763 } 765 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/persistent_tab_restore_service.cc ('k') | chrome/browser/sessions/session_restore.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698