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

Side by Side Diff: chrome/test/nacl/pnacl_header_test.h

Issue 524483002: Revert of Set RequestContextObject for PNaCl pexe fetches, to fix On-Demand update. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | chrome/test/nacl/pnacl_header_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_TEST_NACL_PNACL_HEADER_TEST_H_ 5 #ifndef CHROME_TEST_NACL_PNACL_HEADER_TEST_H_
6 #define CHROME_TEST_NACL_PNACL_HEADER_TEST_H_ 6 #define CHROME_TEST_NACL_PNACL_HEADER_TEST_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
11 #include "content/public/browser/resource_dispatcher_host_delegate.h"
12 #include "content/public/common/resource_type.h"
13 11
14 namespace base { 12 namespace base {
15 class FilePath; 13 class FilePath;
16 } 14 }
17 15
18 namespace net { 16 namespace net {
19 namespace test_server { 17 namespace test_server {
20 struct HttpRequest; 18 struct HttpRequest;
21 class HttpResponse; 19 class HttpResponse;
22 } 20 }
23 } 21 }
24 22
25 using content::ResourceDispatcherHostDelegate;
26
27 class TestDispatcherHostDelegate : public ResourceDispatcherHostDelegate {
28 public:
29 explicit TestDispatcherHostDelegate()
30 : ResourceDispatcherHostDelegate(), found_pnacl_header_(false) {}
31
32 virtual ~TestDispatcherHostDelegate() {}
33
34 virtual void RequestBeginning(
35 net::URLRequest* request,
36 content::ResourceContext* resource_context,
37 content::AppCacheService* appcache_service,
38 content::ResourceType resource_type,
39 ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
40
41 bool found_pnacl_header() const { return found_pnacl_header_; }
42
43 private:
44 bool found_pnacl_header_;
45
46 DISALLOW_COPY_AND_ASSIGN(TestDispatcherHostDelegate);
47 };
48
49 class PnaclHeaderTest : public InProcessBrowserTest { 23 class PnaclHeaderTest : public InProcessBrowserTest {
50 public: 24 public:
51 PnaclHeaderTest(); 25 PnaclHeaderTest();
52 virtual ~PnaclHeaderTest(); 26 virtual ~PnaclHeaderTest();
53 27
54 // Run a simple test that checks that the NaCl plugin sends the right 28 // Run a simple test that checks that the NaCl plugin sends the right
55 // headers when doing |expected_noncors| same origin pexe load requests 29 // headers when doing |expected_noncors| same origin pexe load requests
56 // and |expected_cors| cross origin pexe load requests. 30 // and |expected_cors| cross origin pexe load requests.
57 void RunLoadTest(const std::string& url, 31 void RunLoadTest(const std::string& url,
58 int expected_noncors, 32 int expected_noncors,
59 int expected_cors); 33 int expected_cors);
60 34
61 private: 35 private:
62 void StartServer(); 36 void StartServer();
63 37
64 scoped_ptr<net::test_server::HttpResponse> WatchForPexeFetch( 38 scoped_ptr<net::test_server::HttpResponse> WatchForPexeFetch(
65 const net::test_server::HttpRequest& request); 39 const net::test_server::HttpRequest& request);
66 40
67 int noncors_loads_; 41 int noncors_loads_;
68 int cors_loads_; 42 int cors_loads_;
69 TestDispatcherHostDelegate test_delegate_;
70 DISALLOW_COPY_AND_ASSIGN(PnaclHeaderTest); 43 DISALLOW_COPY_AND_ASSIGN(PnaclHeaderTest);
71 }; 44 };
72 45
73 #endif // CHROME_TEST_NACL_PNACL_HEADER_TEST_H_ 46 #endif // CHROME_TEST_NACL_PNACL_HEADER_TEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/test/nacl/pnacl_header_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698