#include "content/public/test/render_view_test.h"
#include "content/public/test/test_utils.h"
#include "content/renderer/accessibility/renderer_accessibility.h"
-#include "content/renderer/accessibility/renderer_accessibility_complete.h"
-#include "content/renderer/accessibility/renderer_accessibility_focus_only.h"
#include "content/renderer/history_controller.h"
#include "content/renderer/history_serialization.h"
#include "content/renderer/render_process.h"
{ MockKeyboard::RIGHT_ALT, ui::EF_ALT_DOWN },
};
int flags = 0;
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kModifierMap); ++i) {
+ for (size_t i = 0; i < arraysize(kModifierMap); ++i) {
if (kModifierMap[i].src & modifiers) {
flags |= kModifierMap[i].dst;
}
class WebUITestWebUIControllerFactory : public WebUIControllerFactory {
public:
- virtual WebUIController* CreateWebUIControllerForURL(
- WebUI* web_ui, const GURL& url) const OVERRIDE {
+ WebUIController* CreateWebUIControllerForURL(WebUI* web_ui,
+ const GURL& url) const override {
return NULL;
}
- virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
- const GURL& url) const OVERRIDE {
+ WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
+ const GURL& url) const override {
return WebUI::kNoWebUI;
}
- virtual bool UseWebUIForURL(BrowserContext* browser_context,
- const GURL& url) const OVERRIDE {
+ bool UseWebUIForURL(BrowserContext* browser_context,
+ const GURL& url) const override {
return HasWebUIScheme(url);
}
- virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
- const GURL& url) const OVERRIDE {
+ bool UseWebUIBindingsForURL(BrowserContext* browser_context,
+ const GURL& url) const override {
return HasWebUIScheme(url);
}
};
mock_keyboard_.reset(new MockKeyboard());
}
- virtual ~RenderViewImplTest() {}
+ ~RenderViewImplTest() override {}
- virtual void SetUp() OVERRIDE {
+ void SetUp() override {
RenderViewTest::SetUp();
// Enable Blink's experimental and test only features so that test code
// does not have to bother enabling each feature.
FrameMsg_Navigate_Params nav_params;
// An http url will trigger a resource load so cannot be used here.
- nav_params.url = GURL("data:text/html,<div>Page</div>");
- nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- nav_params.transition = ui::PAGE_TRANSITION_TYPED;
+ nav_params.
common_params.url = GURL("data:text/html,<div>Page</div>");
+ nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
nav_params.page_id = -1;
- nav_params.is_post = true;
- nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ nav_params.request_params.is_post = true;
+ nav_params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
// Set up post data.
const unsigned char* raw_data = reinterpret_cast<const unsigned char*>(
"post \0\ndata");
const unsigned int length = 11;
const std::vector<unsigned char> post_data(raw_data, raw_data + length);
- nav_params.browser_initiated_post_data = post_data;
+ nav_params.request_params.browser_initiated_post_data = post_data;
frame()->OnNavigate(nav_params);
ProcessPendingMessages();
// If we navigate back to this RenderView, ensure we don't send a state
// update for the swapped out URL. (http://crbug.com/72235)
FrameMsg_Navigate_Params nav_params;
- nav_params.url = GURL("data:text/html,<div>Page B</div>");
- nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- nav_params.transition = ui::PAGE_TRANSITION_TYPED;
+ nav_params.
common_params.url = GURL("data:text/html,<div>Page B</div>");
+ nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
nav_params.current_history_list_length = 1;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 1;
nav_params.page_id = -1;
- nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ nav_params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(nav_params);
ProcessPendingMessages();
const IPC::Message* msg3 = render_thread_->sink().GetUniqueMessageMatching(
// Back to page A (page_id 1) and commit.
FrameMsg_Navigate_Params params_A;
- params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params_A.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params_A.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_A.current_history_list_length = 2;
params_A.current_history_list_offset = 1;
params_A.pending_history_list_offset = 0;
params_A.page_id = 1;
- params_A.page_state = state_A;
- params_A.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params_A.commit_params.page_state = state_A;
+ params_A.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params_A);
ProcessPendingMessages();
// provisional load in the renderer process, after we unload the old page).
// Ensure the old page gets reloaded, not swappedout://.
FrameMsg_Navigate_Params nav_params;
- nav_params.url = GURL("data:text/html,<div>Page A</div>");
- nav_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
- nav_params.transition = ui::PAGE_TRANSITION_RELOAD;
+ nav_params.
common_params.url = GURL("data:text/html,<div>Page A</div>");
+ nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::RELOAD;
+ nav_params.common_params.transition = ui::PAGE_TRANSITION_RELOAD;
nav_params.current_history_list_length = 2;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 0;
nav_params.page_id = 1;
- nav_params.page_state = state_A;
- nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ nav_params.commit_params.page_state = state_A;
+ nav_params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(nav_params);
ProcessPendingMessages();
// Go back to C and commit, preparing for our real test.
FrameMsg_Navigate_Params params_C;
- params_C.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params_C.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params_C.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params_C.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_C.current_history_list_length = 4;
params_C.current_history_list_offset = 3;
params_C.pending_history_list_offset = 2;
params_C.page_id = 3;
- params_C.page_state = state_C;
- params_C.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params_C.commit_params.page_state = state_C;
+ params_C.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params_C);
ProcessPendingMessages();
render_thread_->sink().ClearMessages();
// Back to page B (page_id 2), without committing.
FrameMsg_Navigate_Params params_B;
- params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params_B.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params_B.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 4;
params_B.current_history_list_offset = 2;
params_B.pending_history_list_offset = 1;
params_B.page_id = 2;
- params_B.page_state = state_B;
- params_B.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params_B.commit_params.page_state = state_B;
+ params_B.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params_B);
// Back to page A (page_id 1) and commit.
FrameMsg_Navigate_Params params;
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 4;
params_B.current_history_list_offset = 2;
params_B.pending_history_list_offset = 0;
params.page_id = 1;
- params.page_state = state_A;
- params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params.commit_params.page_state = state_A;
+ params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params);
ProcessPendingMessages();
// Back to page A (page_id 1) and commit.
FrameMsg_Navigate_Params params_A;
- params_A.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params_A.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params_A.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params_A.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_A.current_history_list_length = 2;
params_A.current_history_list_offset = 1;
params_A.pending_history_list_offset = 0;
params_A.page_id = 1;
- params_A.page_state = state_A;
- params_A.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params_A.commit_params.page_state = state_A;
+ params_A.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params_A);
ProcessPendingMessages();
// The browser then sends a stale navigation to B, which should be ignored.
FrameMsg_Navigate_Params params_B;
- params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params_B.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params_B.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 2;
params_B.current_history_list_offset = 0;
params_B.pending_history_list_offset = 1;
params_B.page_id = 2;
- params_B.page_state = state_A; // Doesn't matter, just has to be present.
- params_B.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params_B.commit_params.page_state =
+ state_A; // Doesn't matter, just has to be present.
+ params_B.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params_B);
// State should be unchanged.
// It has now dropped the first entry, but the renderer isn't notified.
// Ensure that going back to page B (page_id 2) at offset 0 is successful.
FrameMsg_Navigate_Params params_B;
- params_B.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params_B.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
+ params_B.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params_B.common_params.transition = ui::PAGE_TRANSITION_FORWARD_BACK;
params_B.current_history_list_length = 2;
params_B.current_history_list_offset = 1;
params_B.pending_history_list_offset = 0;
params_B.page_id = 2;
- params_B.page_state = state_B;
- params_B.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params_B.commit_params.page_state = state_B;
+ params_B.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params_B);
ProcessPendingMessages();
input_mode = params.b;
EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD, type);
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kInputModeTestCases); i++) {
+ for (size_t i = 0; i < arraysize(kInputModeTestCases); i++) {
const InputModeTestCase* test_case = &kInputModeTestCases[i];
std::string javascript =
base::StringPrintf("document.getElementById('%s').focus();",
{IME_CONFIRMCOMPOSITION, false, -1, -1, L"", L"\xC548\xB155"},
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kImeMessages); i++) {
+ for (size_t i = 0; i < arraysize(kImeMessages); i++) {
const ImeMessage* ime_message = &kImeMessages[i];
switch (ime_message->command) {
case IME_INITIALIZE:
{ blink::WebTextDirectionRightToLeft, L"\x000A" L"rtl,rtl" },
{ blink::WebTextDirectionLeftToRight, L"\x000A" L"ltr,ltr" },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTextDirection); ++i) {
+ for (size_t i = 0; i < arraysize(kTextDirection); ++i) {
// Set the text direction of the <textarea> element.
ExecuteJavaScript("document.getElementById('test').focus();");
view()->OnSetTextDirection(kTextDirection[i].direction);
MockKeyboard::LAYOUT_UNITED_STATES,
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kLayouts); ++i) {
+ for (size_t i = 0; i < arraysize(kLayouts); ++i) {
// For each key code, we send three keyboard events.
// * we press only the key;
// * we press the key and a left-shift key, and;
};
MockKeyboard::Layout layout = kLayouts[i];
- for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kModifierData); ++j) {
+ for (size_t j = 0; j < arraysize(kModifierData); ++j) {
// Virtual key codes used for this test.
static const int kKeyCodes[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
};
MockKeyboard::Modifiers modifiers = kModifierData[j].modifiers;
- for (size_t k = 0; k < ARRAYSIZE_UNSAFE(kKeyCodes); ++k) {
+ for (size_t k = 0; k < arraysize(kKeyCodes); ++k) {
// Send a keyboard event to the RenderView object.
// We should test a keyboard event only when the given keyboard-layout
// driver is installed in a PC and the driver can assign a Unicode
},
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kLayouts); ++i) {
+ for (size_t i = 0; i < arraysize(kLayouts); ++i) {
// Load an HTML page consisting of one <div> element.
// This <div> element is used by the EditorClientImpl class to insert
// characters received through the RenderWidget::OnHandleInputEvent()
};
MockKeyboard::Layout layout = kLayouts[i].layout;
- for (size_t j = 0; j < ARRAYSIZE_UNSAFE(kModifiers); ++j) {
+ for (size_t j = 0; j < arraysize(kModifiers); ++j) {
// Virtual key codes used for this test.
static const int kKeyCodes[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
};
MockKeyboard::Modifiers modifiers = kModifiers[j];
- for (size_t k = 0; k < ARRAYSIZE_UNSAFE(kKeyCodes); ++k) {
+ for (size_t k = 0; k < arraysize(kKeyCodes); ++k) {
// Send a keyboard event to the RenderView object.
// We should test a keyboard event only when the given keyboard-layout
// driver is installed in a PC and the driver can assign a Unicode
// but won't complete synchronously.
FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params.url = GURL("data:text/html,test data");
- params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params.common_params.url = GURL("data:text/html,test data");
+ params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params);
// An error occurred.
// but won't complete synchronously.
FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params.url = GURL("data:text/html,test data");
- params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params.common_params.url = GURL("data:text/html,test data");
+ params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params);
// A cancellation occurred.
FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
// Verifies navigation to a URL with preset zoom level indeed sets the level.
// Regression test for http://crbug.com/139559, where the level was not
// properly set when it is out of the default zoom limits of WebView.
- params.url = GURL("data:text/html,min_zoomlimit_test");
- view()->OnSetZoomLevelForLoadingURL(params.url, kMinZoomLevel);
+ params.common_params.url = GURL("data:text/html,min_zoomlimit_test");
+ view()->OnSetZoomLevelForLoadingURL(params.common_params.url, kMinZoomLevel);
frame()->OnNavigate(params);
ProcessPendingMessages();
EXPECT_DOUBLE_EQ(kMinZoomLevel, view()->GetWebView()->zoomLevel());
// It should work even when the zoom limit is temporarily changed in the page.
view()->GetWebView()->zoomLimitsChanged(ZoomFactorToZoomLevel(1.0),
ZoomFactorToZoomLevel(1.0));
- params.url = GURL("data:text/html,max_zoomlimit_test");
- view()->OnSetZoomLevelForLoadingURL(params.url, kMaxZoomLevel);
+ params.common_params.url = GURL("data:text/html,max_zoomlimit_test");
+ view()->OnSetZoomLevelForLoadingURL(params.common_params.url, kMaxZoomLevel);
frame()->OnNavigate(params);
ProcessPendingMessages();
EXPECT_DOUBLE_EQ(kMaxZoomLevel, view()->GetWebView()->zoomLevel());
// Navigate the frame only.
FrameMsg_Navigate_Params nav_params;
- nav_params.url = GURL("data:text/html,world");
- nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- nav_params.transition = ui::PAGE_TRANSITION_TYPED;
+ nav_params.common_params.url = GURL("data:text/html,world");
+ nav_params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
nav_params.current_history_list_length = 1;
nav_params.current_history_list_offset = 0;
nav_params.pending_history_list_offset = 1;
nav_params.page_id = -1;
nav_params.frame_to_navigate = "frame";
- nav_params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ nav_params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(nav_params);
FrameLoadWaiter(
RenderFrame::FromWebFrame(frame()->GetWebFrame()->firstChild())).Wait();
class SuppressErrorPageTest : public RenderViewTest {
public:
- virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE {
+ ContentRendererClient* CreateContentRendererClient() override {
return new TestContentRendererClient;
}
private:
class TestContentRendererClient : public ContentRendererClient {
public:
- virtual bool ShouldSuppressErrorPage(RenderFrame* render_frame,
- const GURL& url) OVERRIDE {
+ bool ShouldSuppressErrorPage(RenderFrame* render_frame,
+ const GURL& url) override {
return url == GURL("http://example.com/suppress");
}
- virtual void GetNavigationErrorStrings(
- content::RenderView* render_view,
- blink::WebFrame* frame,
- const blink::WebURLRequest& failed_request,
- const blink::WebURLError& error,
- std::string* error_html,
- base::string16* error_description) OVERRIDE {
+ void GetNavigationErrorStrings(content::RenderView* render_view,
+ blink::WebFrame* frame,
+ const blink::WebURLRequest& failed_request,
+ const blink::WebURLError& error,
+ std::string* error_html,
+ base::string16* error_description) override {
if (error_html)
*error_html = "A suffusion of yellow.";
}
// but won't complete synchronously.
FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params.url = GURL("data:text/html,test data");
- params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params.common_params.url = GURL("data:text/html,test data");
+ params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params);
// An error occurred.
// but won't complete synchronously.
FrameMsg_Navigate_Params params;
params.page_id = -1;
- params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- params.url = GURL("data:text/html,test data");
- params.browser_navigation_start = base::TimeTicks::FromInternalValue(1);
+ params.common_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
+ params.common_params.url = GURL("data:text/html,test data");
+ params.commit_params.browser_navigation_start =
+ base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(params);
// An error occurred.
frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);
ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode());
ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
- ASSERT_EQ(RendererAccessibilityTypeComplete,
- frame()->renderer_accessibility()->GetType());
frame()->OnSetAccessibilityMode(AccessibilityModeOff);
ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
frame()->OnSetAccessibilityMode(AccessibilityModeComplete);
ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());
ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
- ASSERT_EQ(RendererAccessibilityTypeComplete,
- frame()->renderer_accessibility()->GetType());
-
- frame()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);
- ASSERT_EQ(AccessibilityModeEditableTextOnly, frame()->accessibility_mode());
- ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
- ASSERT_EQ(RendererAccessibilityTypeFocusOnly,
- frame()->renderer_accessibility()->GetType());
}
TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {
// OnNavigate() is called.
base::Time before_navigation = base::Time::Now();
FrameMsg_Navigate_Params early_nav_params;
- early_nav_params.url = GURL("data:text/html,<div>Page</div>");
- early_nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- early_nav_params.transition = ui::PAGE_TRANSITION_TYPED;
+ early_nav_params.common_params.url = GURL("data:text/html,<div>Page</div>");
+ early_nav_params.common_params.navigation_type =
+ FrameMsg_Navigate_Type::NORMAL;
+ early_nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
early_nav_params.page_id = -1;
- early_nav_params.is_post = true;
- early_nav_params.browser_navigation_start =
+ early_nav_params.request_params.is_post = true;
+ early_nav_params.commit_params.browser_navigation_start =
base::TimeTicks::FromInternalValue(1);
frame()->OnNavigate(early_nav_params);
// days from now is *not* reported as one that starts in the future; as we
// sanitize the override allowing a maximum of ::Now().
FrameMsg_Navigate_Params late_nav_params;
- late_nav_params.url = GURL("data:text/html,<div>Another page</div>");
- late_nav_params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
- late_nav_params.transition = ui::PAGE_TRANSITION_TYPED;
+ late_nav_params.common_params.url =
+ GURL("data:text/html,<div>Another page</div>");
+ late_nav_params.common_params.navigation_type =
+ FrameMsg_Navigate_Type::NORMAL;
+ late_nav_params.common_params.transition = ui::PAGE_TRANSITION_TYPED;
late_nav_params.page_id = -1;
- late_nav_params.is_post = true;
- late_nav_params.browser_navigation_start =
+ late_nav_params.request_params.is_post = true;
+ late_nav_params.commit_params.browser_navigation_start =
base::TimeTicks::Now() + base::TimeDelta::FromDays(42);
frame()->OnNavigate(late_nav_params);
projects / platform / framework / web / crosswalk.git / blobdiff