OLD | NEW |
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 #include "public/platform/Platform.h" | 43 #include "public/platform/Platform.h" |
44 #include "public/platform/WebString.h" | 44 #include "public/platform/WebString.h" |
45 #include "public/platform/WebThread.h" | 45 #include "public/platform/WebThread.h" |
46 #include "public/platform/WebURL.h" | 46 #include "public/platform/WebURL.h" |
47 #include "public/platform/WebURLRequest.h" | 47 #include "public/platform/WebURLRequest.h" |
48 #include "public/platform/WebURLResponse.h" | 48 #include "public/platform/WebURLResponse.h" |
49 #include "public/platform/WebUnitTestSupport.h" | 49 #include "public/platform/WebUnitTestSupport.h" |
50 #include "wtf/Vector.h" | 50 #include "wtf/Vector.h" |
51 | 51 |
52 using namespace WebCore; | 52 using namespace WebCore; |
53 using namespace WebKit; | 53 using namespace blink; |
54 using WebKit::FrameTestHelpers::runPendingTasks; | 54 using blink::FrameTestHelpers::runPendingTasks; |
55 using WebKit::URLTestHelpers::toKURL; | 55 using blink::URLTestHelpers::toKURL; |
56 using WebKit::URLTestHelpers::registerMockedURLLoad; | 56 using blink::URLTestHelpers::registerMockedURLLoad; |
57 | 57 |
58 namespace { | 58 namespace { |
59 | 59 |
60 class TestWebFrameClient : public WebFrameClient { | 60 class TestWebFrameClient : public WebFrameClient { |
61 public: | 61 public: |
62 virtual ~TestWebFrameClient() { } | 62 virtual ~TestWebFrameClient() { } |
63 }; | 63 }; |
64 | 64 |
65 class PageSerializerTest : public testing::Test { | 65 class PageSerializerTest : public testing::Test { |
66 public: | 66 public: |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 | 226 |
227 registerURL("font.html", "text/html"); | 227 registerURL("font.html", "text/html"); |
228 registerURL("font.ttf", "application/octet-stream"); | 228 registerURL("font.ttf", "application/octet-stream"); |
229 | 229 |
230 serialize("font.html"); | 230 serialize("font.html"); |
231 | 231 |
232 EXPECT_TRUE(isSerialized("font.ttf", "application/octet-stream")); | 232 EXPECT_TRUE(isSerialized("font.ttf", "application/octet-stream")); |
233 } | 233 } |
234 | 234 |
235 } | 235 } |
OLD | NEW |