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

Side by Side Diff: third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 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 /* 1 /*
2 * Copyright (c) 2013, Opera Software ASA. All rights reserved. 2 * Copyright (c) 2013, Opera Software ASA. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 FrameSerializerTest() 62 FrameSerializerTest()
63 : m_folder(WebString::fromUTF8("frameserializer/")) 63 : m_folder(WebString::fromUTF8("frameserializer/"))
64 , m_baseUrl(toKURL("http://www.test.com")) 64 , m_baseUrl(toKURL("http://www.test.com"))
65 { 65 {
66 } 66 }
67 67
68 protected: 68 protected:
69 void SetUp() override 69 void SetUp() override
70 { 70 {
71 // We want the images to load and JavaScript to be on. 71 // We want the images to load and JavaScript to be on.
72 m_helper.initialize(true, 0, 0, &configureSettings); 72 m_helper.initialize(true, nullptr, nullptr, nullptr, &configureSettings) ;
73 } 73 }
74 74
75 void TearDown() override 75 void TearDown() override
76 { 76 {
77 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs(); 77 Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
78 WebCache::clear(); 78 WebCache::clear();
79 } 79 }
80 80
81 void setBaseFolder(const char* folder) 81 void setBaseFolder(const char* folder)
82 { 82 {
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 EXPECT_EQ("saved from url=(0015)http://foo.com/", FrameSerializer::markOfThe WebDeclaration(KURL(ParsedURLString, "http://foo.com"))); 526 EXPECT_EQ("saved from url=(0015)http://foo.com/", FrameSerializer::markOfThe WebDeclaration(KURL(ParsedURLString, "http://foo.com")));
527 EXPECT_EQ("saved from url=(0015)http://f-o.com/", FrameSerializer::markOfThe WebDeclaration(KURL(ParsedURLString, "http://f-o.com"))); 527 EXPECT_EQ("saved from url=(0015)http://f-o.com/", FrameSerializer::markOfThe WebDeclaration(KURL(ParsedURLString, "http://f-o.com")));
528 EXPECT_EQ("saved from url=(0019)http://foo.com-%2D/", FrameSerializer::markO fTheWebDeclaration(KURL(ParsedURLString, "http://foo.com--"))); 528 EXPECT_EQ("saved from url=(0019)http://foo.com-%2D/", FrameSerializer::markO fTheWebDeclaration(KURL(ParsedURLString, "http://foo.com--")));
529 EXPECT_EQ("saved from url=(0024)http://f-%2D.com-%2D%3E/", FrameSerializer:: markOfTheWebDeclaration(KURL(ParsedURLString, "http://f--.com-->"))); 529 EXPECT_EQ("saved from url=(0024)http://f-%2D.com-%2D%3E/", FrameSerializer:: markOfTheWebDeclaration(KURL(ParsedURLString, "http://f--.com-->")));
530 EXPECT_EQ("saved from url=(0020)http://foo.com/?-%2D", FrameSerializer::mark OfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com?--"))); 530 EXPECT_EQ("saved from url=(0020)http://foo.com/?-%2D", FrameSerializer::mark OfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com?--")));
531 EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D", FrameSerializer::mark OfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#--"))); 531 EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D", FrameSerializer::mark OfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#--")));
532 EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz", FrameSerializer ::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#bar--baz"))); 532 EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz", FrameSerializer ::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#bar--baz")));
533 } 533 }
534 534
535 } // namespace blink 535 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698