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

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

Issue 10170016: Add info about user agent overrides to WebContents (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Forgot to initialize bool in constructor; win_rel caught it Created 8 years, 7 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 unified diff | Download patch
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 "chrome/browser/sessions/session_service_test_helper.h" 5 #include "chrome/browser/sessions/session_service_test_helper.h"
6 6
7 #include "base/memory/scoped_vector.h" 7 #include "base/memory/scoped_vector.h"
8 #include "chrome/browser/sessions/session_backend.h" 8 #include "chrome/browser/sessions/session_backend.h"
9 #include "chrome/browser/sessions/session_id.h" 9 #include "chrome/browser/sessions/session_id.h"
10 #include "chrome/browser/sessions/session_service.h" 10 #include "chrome/browser/sessions/session_service.h"
(...skipping 25 matching lines...) Expand all
36 service()->SetSelectedTabInWindow(window_id, visual_index); 36 service()->SetSelectedTabInWindow(window_id, visual_index);
37 } 37 }
38 38
39 void SessionServiceTestHelper::SetTabExtensionAppID( 39 void SessionServiceTestHelper::SetTabExtensionAppID(
40 const SessionID& window_id, 40 const SessionID& window_id,
41 const SessionID& tab_id, 41 const SessionID& tab_id,
42 const std::string& extension_app_id) { 42 const std::string& extension_app_id) {
43 service()->SetTabExtensionAppID(window_id, tab_id, extension_app_id); 43 service()->SetTabExtensionAppID(window_id, tab_id, extension_app_id);
44 } 44 }
45 45
46 void SessionServiceTestHelper::SetTabUserAgentOverride(
47 const SessionID& window_id,
48 const SessionID& tab_id,
49 const std::string& user_agent_override) {
50 service()->SetTabUserAgentOverride(window_id, tab_id, user_agent_override);
51 }
52
46 // Be sure and null out service to force closing the file. 53 // Be sure and null out service to force closing the file.
47 void SessionServiceTestHelper::ReadWindows( 54 void SessionServiceTestHelper::ReadWindows(
48 std::vector<SessionWindow*>* windows) { 55 std::vector<SessionWindow*>* windows) {
49 Time last_time; 56 Time last_time;
50 ScopedVector<SessionCommand> read_commands; 57 ScopedVector<SessionCommand> read_commands;
51 backend()->ReadLastSessionCommandsImpl(&(read_commands.get())); 58 backend()->ReadLastSessionCommandsImpl(&(read_commands.get()));
52 RestoreSessionFromCommands(read_commands.get(), windows); 59 RestoreSessionFromCommands(read_commands.get(), windows);
53 } 60 }
54 61
55 void SessionServiceTestHelper::AssertTabEquals(SessionID& window_id, 62 void SessionServiceTestHelper::AssertTabEquals(SessionID& window_id,
(...skipping 21 matching lines...) Expand all
77 const TabNavigation& expected, 84 const TabNavigation& expected,
78 const TabNavigation& actual) { 85 const TabNavigation& actual) {
79 EXPECT_TRUE(expected.virtual_url() == actual.virtual_url()); 86 EXPECT_TRUE(expected.virtual_url() == actual.virtual_url());
80 EXPECT_EQ(expected.referrer().url, actual.referrer().url); 87 EXPECT_EQ(expected.referrer().url, actual.referrer().url);
81 EXPECT_EQ(expected.referrer().policy, actual.referrer().policy); 88 EXPECT_EQ(expected.referrer().policy, actual.referrer().policy);
82 EXPECT_EQ(expected.title(), actual.title()); 89 EXPECT_EQ(expected.title(), actual.title());
83 EXPECT_EQ(expected.state(), actual.state()); 90 EXPECT_EQ(expected.state(), actual.state());
84 EXPECT_EQ(expected.transition(), actual.transition()); 91 EXPECT_EQ(expected.transition(), actual.transition());
85 EXPECT_EQ(expected.type_mask(), actual.type_mask()); 92 EXPECT_EQ(expected.type_mask(), actual.type_mask());
86 EXPECT_TRUE(expected.original_request_url() == actual.original_request_url()); 93 EXPECT_TRUE(expected.original_request_url() == actual.original_request_url());
94 EXPECT_EQ(expected.is_overriding_user_agent(),
95 actual.is_overriding_user_agent());
87 } 96 }
88 97
89 void SessionServiceTestHelper::AssertSingleWindowWithSingleTab( 98 void SessionServiceTestHelper::AssertSingleWindowWithSingleTab(
90 const std::vector<SessionWindow*>& windows, 99 const std::vector<SessionWindow*>& windows,
91 size_t nav_count) { 100 size_t nav_count) {
92 ASSERT_EQ(1U, windows.size()); 101 ASSERT_EQ(1U, windows.size());
93 EXPECT_EQ(1U, windows[0]->tabs.size()); 102 EXPECT_EQ(1U, windows[0]->tabs.size());
94 EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size()); 103 EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size());
95 } 104 }
96 105
97 SessionBackend* SessionServiceTestHelper::backend() { 106 SessionBackend* SessionServiceTestHelper::backend() {
98 return service_->backend(); 107 return service_->backend();
99 } 108 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/session_service_test_helper.h ('k') | chrome/browser/sessions/session_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698