OLD | NEW |
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 "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
6 #include "content/public/test/render_view_test.h" | 6 #include "content/public/test/render_view_test.h" |
| 7 #include "content/renderer/pepper/url_request_info_util.h" |
7 #include "ppapi/proxy/connection.h" | 8 #include "ppapi/proxy/connection.h" |
8 #include "ppapi/proxy/url_request_info_resource.h" | 9 #include "ppapi/proxy/url_request_info_resource.h" |
9 #include "ppapi/shared_impl/test_globals.h" | 10 #include "ppapi/shared_impl/test_globals.h" |
10 #include "ppapi/shared_impl/url_request_info_data.h" | 11 #include "ppapi/shared_impl/url_request_info_data.h" |
11 #include "ppapi/thunk/thunk.h" | 12 #include "ppapi/thunk/thunk.h" |
12 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
13 #include "third_party/WebKit/public/platform/WebURLRequest.h" | 14 #include "third_party/WebKit/public/platform/WebURLRequest.h" |
14 #include "third_party/WebKit/public/web/WebFrame.h" | 15 #include "third_party/WebKit/public/web/WebFrame.h" |
15 #include "third_party/WebKit/public/web/WebFrameClient.h" | 16 #include "third_party/WebKit/public/web/WebFrameClient.h" |
16 #include "third_party/WebKit/public/web/WebView.h" | 17 #include "third_party/WebKit/public/web/WebView.h" |
17 #include "webkit/common/user_agent/user_agent.h" | 18 #include "webkit/common/user_agent/user_agent.h" |
18 #include "webkit/common/user_agent/user_agent_util.h" | 19 #include "webkit/common/user_agent/user_agent_util.h" |
19 #include "webkit/plugins/ppapi/url_request_info_util.h" | |
20 | 20 |
21 // This test is a end-to-end test from the resource to the WebKit request | 21 // This test is a end-to-end test from the resource to the WebKit request |
22 // object. The actual resource implementation is so simple, it makes sense to | 22 // object. The actual resource implementation is so simple, it makes sense to |
23 // test it by making sure the conversion routines actually work at the same | 23 // test it by making sure the conversion routines actually work at the same |
24 // time. | 24 // time. |
25 | 25 |
26 using WebKit::WebCString; | 26 using WebKit::WebCString; |
27 using WebKit::WebFrame; | 27 using WebKit::WebFrame; |
28 using WebKit::WebFrameClient; | 28 using WebKit::WebFrameClient; |
29 using WebKit::WebString; | 29 using WebKit::WebString; |
(...skipping 14 matching lines...) Expand all Loading... |
44 | 44 |
45 // The base class destructor is protected, so derive. | 45 // The base class destructor is protected, so derive. |
46 class TestWebFrameClient : public WebFrameClient { | 46 class TestWebFrameClient : public WebFrameClient { |
47 }; | 47 }; |
48 | 48 |
49 } // namespace | 49 } // namespace |
50 | 50 |
51 using ppapi::proxy::URLRequestInfoResource; | 51 using ppapi::proxy::URLRequestInfoResource; |
52 using ppapi::URLRequestInfoData; | 52 using ppapi::URLRequestInfoData; |
53 | 53 |
54 // TODO(brettw) move to content namespace when url_request_info_util.h is moved | |
55 // to this directory. This file used to be in webkit/plugins/ppapi and had to | |
56 // be moved in advance of the rest of the files to make things compile. | |
57 namespace webkit { | 54 namespace webkit { |
58 namespace ppapi { | 55 namespace ppapi { |
59 | 56 |
60 class URLRequestInfoTest : public content::RenderViewTest { | 57 class URLRequestInfoTest : public content::RenderViewTest { |
61 public: | 58 public: |
62 URLRequestInfoTest() : pp_instance_(1234) { | 59 URLRequestInfoTest() : pp_instance_(1234) { |
63 } | 60 } |
64 | 61 |
65 virtual void SetUp() OVERRIDE { | 62 virtual void SetUp() OVERRIDE { |
66 RenderViewTest::SetUp(); | 63 RenderViewTest::SetUp(); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 EXPECT_TRUE(IsExpected( | 248 EXPECT_TRUE(IsExpected( |
252 GetHeaderValue("foo"), "bar")); | 249 GetHeaderValue("foo"), "bar")); |
253 EXPECT_TRUE(IsExpected( | 250 EXPECT_TRUE(IsExpected( |
254 GetHeaderValue("bar"), "baz")); | 251 GetHeaderValue("bar"), "baz")); |
255 } | 252 } |
256 | 253 |
257 // TODO(bbudge) Unit tests for AppendDataToBody, AppendFileToBody. | 254 // TODO(bbudge) Unit tests for AppendDataToBody, AppendFileToBody. |
258 | 255 |
259 } // namespace ppapi | 256 } // namespace ppapi |
260 } // namespace webkit | 257 } // namespace webkit |
OLD | NEW |