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

Side by Side Diff: webkit/browser/fileapi/file_system_url_request_job_unittest.cc

Issue 23494028: Do not return FileSystem contents if the profile is in incognito mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "webkit/browser/fileapi/file_system_url_request_job.h" 5 #include "webkit/browser/fileapi/file_system_url_request_job.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
(...skipping 10 matching lines...) Expand all
22 #include "net/base/load_flags.h" 22 #include "net/base/load_flags.h"
23 #include "net/base/mime_util.h" 23 #include "net/base/mime_util.h"
24 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
25 #include "net/base/net_util.h" 25 #include "net/base/net_util.h"
26 #include "net/http/http_request_headers.h" 26 #include "net/http/http_request_headers.h"
27 #include "net/url_request/url_request.h" 27 #include "net/url_request/url_request.h"
28 #include "net/url_request/url_request_context.h" 28 #include "net/url_request/url_request_context.h"
29 #include "net/url_request/url_request_test_util.h" 29 #include "net/url_request/url_request_test_util.h"
30 #include "testing/gtest/include/gtest/gtest.h" 30 #include "testing/gtest/include/gtest/gtest.h"
31 #include "webkit/browser/fileapi/async_file_test_helper.h" 31 #include "webkit/browser/fileapi/async_file_test_helper.h"
32 #include "webkit/browser/fileapi/external_mount_points.h"
32 #include "webkit/browser/fileapi/file_system_context.h" 33 #include "webkit/browser/fileapi/file_system_context.h"
33 #include "webkit/browser/fileapi/file_system_file_util.h" 34 #include "webkit/browser/fileapi/file_system_file_util.h"
34 #include "webkit/browser/fileapi/mock_file_system_context.h" 35 #include "webkit/browser/fileapi/mock_file_system_context.h"
35 36
36 namespace fileapi { 37 namespace fileapi {
37 namespace { 38 namespace {
38 39
39 // We always use the TEMPORARY FileSystem in this test. 40 // We always use the TEMPORARY FileSystem in this test.
40 const char kFileSystemURLPrefix[] = "filesystem:http://remote/temporary/"; 41 const char kFileSystemURLPrefix[] = "filesystem:http://remote/temporary/";
41 const char kTestFileData[] = "0123456789"; 42 const char kTestFileData[] = "0123456789";
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 } 85 }
85 86
86 void OnOpenFileSystem(base::PlatformFileError result, 87 void OnOpenFileSystem(base::PlatformFileError result,
87 const std::string& name, 88 const std::string& name,
88 const GURL& root_url) { 89 const GURL& root_url) {
89 ASSERT_EQ(base::PLATFORM_FILE_OK, result); 90 ASSERT_EQ(base::PLATFORM_FILE_OK, result);
90 } 91 }
91 92
92 void TestRequestHelper(const GURL& url, 93 void TestRequestHelper(const GURL& url,
93 const net::HttpRequestHeaders* headers, 94 const net::HttpRequestHeaders* headers,
94 bool run_to_completion) { 95 bool run_to_completion,
96 FileSystemContext* file_system_context) {
95 delegate_.reset(new net::TestDelegate()); 97 delegate_.reset(new net::TestDelegate());
96 // Make delegate_ exit the MessageLoop when the request is done. 98 // Make delegate_ exit the MessageLoop when the request is done.
97 delegate_->set_quit_on_complete(true); 99 delegate_->set_quit_on_complete(true);
98 delegate_->set_quit_on_redirect(true); 100 delegate_->set_quit_on_redirect(true);
99 request_.reset(empty_context_.CreateRequest(url, delegate_.get())); 101 request_.reset(empty_context_.CreateRequest(url, delegate_.get()));
100 if (headers) 102 if (headers)
101 request_->SetExtraRequestHeaders(*headers); 103 request_->SetExtraRequestHeaders(*headers);
102 ASSERT_TRUE(!job_); 104 ASSERT_TRUE(!job_);
103 job_ = new FileSystemURLRequestJob( 105 job_ = new FileSystemURLRequestJob(
104 request_.get(), NULL, file_system_context_.get()); 106 request_.get(), NULL, file_system_context);
105 pending_job_ = job_; 107 pending_job_ = job_;
106 108
107 request_->Start(); 109 request_->Start();
108 ASSERT_TRUE(request_->is_pending()); // verify that we're starting async 110 ASSERT_TRUE(request_->is_pending()); // verify that we're starting async
109 if (run_to_completion) 111 if (run_to_completion)
110 base::MessageLoop::current()->Run(); 112 base::MessageLoop::current()->Run();
111 } 113 }
112 114
113 void TestRequest(const GURL& url) { 115 void TestRequest(const GURL& url) {
114 TestRequestHelper(url, NULL, true); 116 TestRequestHelper(url, NULL, true, file_system_context_.get());
117 }
118
119 void TestRequestWithContext(const GURL& url,
120 FileSystemContext* file_system_context) {
121 TestRequestHelper(url, NULL, true, file_system_context);
115 } 122 }
116 123
117 void TestRequestWithHeaders(const GURL& url, 124 void TestRequestWithHeaders(const GURL& url,
118 const net::HttpRequestHeaders* headers) { 125 const net::HttpRequestHeaders* headers) {
119 TestRequestHelper(url, headers, true); 126 TestRequestHelper(url, headers, true, file_system_context_.get());
120 } 127 }
121 128
122 void TestRequestNoRun(const GURL& url) { 129 void TestRequestNoRun(const GURL& url) {
123 TestRequestHelper(url, NULL, false); 130 TestRequestHelper(url, NULL, false, file_system_context_.get());
124 } 131 }
125 132
126 void CreateDirectory(const base::StringPiece& dir_name) { 133 void CreateDirectory(const base::StringPiece& dir_name) {
127 FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL( 134 FileSystemURL url = file_system_context_->CreateCrackedFileSystemURL(
128 GURL("http://remote"), 135 GURL("http://remote"),
129 kFileSystemTypeTemporary, 136 kFileSystemTypeTemporary,
130 base::FilePath().AppendASCII(dir_name)); 137 base::FilePath().AppendASCII(dir_name));
131 ASSERT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::CreateDirectory( 138 ASSERT_EQ(base::PLATFORM_FILE_OK, AsyncFileTestHelper::CreateDirectory(
132 file_system_context_, url)); 139 file_system_context_, url));
133 } 140 }
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 EXPECT_TRUE(net::GetWellKnownMimeTypeFromExtension( 332 EXPECT_TRUE(net::GetWellKnownMimeTypeFromExtension(
326 extension, &mime_type_direct)); 333 extension, &mime_type_direct));
327 334
328 TestRequest(CreateFileSystemURL(kFilename)); 335 TestRequest(CreateFileSystemURL(kFilename));
329 336
330 std::string mime_type_from_job; 337 std::string mime_type_from_job;
331 request_->GetMimeType(&mime_type_from_job); 338 request_->GetMimeType(&mime_type_from_job);
332 EXPECT_EQ(mime_type_direct, mime_type_from_job); 339 EXPECT_EQ(mime_type_direct, mime_type_from_job);
333 } 340 }
334 341
342 TEST_F(FileSystemURLRequestJobTest, Incognito) {
343 WriteFile("file", kTestFileData, arraysize(kTestFileData) - 1);
344
345 // Creates a new filesystem context for incognito mode.
346 scoped_refptr<FileSystemContext> file_system_context =
347 CreateIncognitoFileSystemContextForTesting(NULL, temp_dir_.path());
348
349 // The request should return NOT_FOUND error if it's in incognito mode.
350 TestRequestWithContext(CreateFileSystemURL("file"),
351 file_system_context.get());
352 ASSERT_FALSE(request_->is_pending());
353 EXPECT_TRUE(delegate_->request_failed());
354 EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request_->status().error());
355
356 // Make sure it returns success with regular (non-incognito) context.
357 TestRequest(CreateFileSystemURL("file"));
358 ASSERT_FALSE(request_->is_pending());
359 EXPECT_EQ(kTestFileData, delegate_->data_received());
360 EXPECT_EQ(200, request_->GetResponseCode());
361 }
362
335 } // namespace 363 } // namespace
336 } // namespace fileapi 364 } // namespace fileapi
OLDNEW
« no previous file with comments | « webkit/browser/fileapi/file_system_url_request_job.cc ('k') | webkit/browser/fileapi/mock_file_system_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698