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 <map> | 5 #include <map> |
6 #include <queue> | 6 #include <queue> |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/json/json_reader.h" | 12 #include "base/json/json_reader.h" |
13 #include "base/json/json_string_value_serializer.h" | 13 #include "base/json/json_string_value_serializer.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
17 #include "base/prefs/pref_member.h" | 17 #include "base/prefs/pref_member.h" |
18 #include "base/stl_util.h" | 18 #include "base/stl_util.h" |
19 #include "base/strings/string_piece.h" | 19 #include "base/strings/string_piece.h" |
20 #include "base/strings/stringprintf.h" | 20 #include "base/strings/stringprintf.h" |
21 #include "base/strings/utf_string_conversions.h" | 21 #include "base/strings/utf_string_conversions.h" |
| 22 #include "base/thread_task_runner_handle.h" |
22 #include "base/time/time.h" | 23 #include "base/time/time.h" |
23 #include "chrome/browser/content_settings/cookie_settings.h" | 24 #include "chrome/browser/content_settings/cookie_settings.h" |
24 #include "chrome/browser/extensions/event_router_forwarder.h" | 25 #include "chrome/browser/extensions/event_router_forwarder.h" |
25 #include "chrome/browser/net/about_protocol_handler.h" | 26 #include "chrome/browser/net/about_protocol_handler.h" |
26 #include "chrome/browser/net/chrome_network_delegate.h" | 27 #include "chrome/browser/net/chrome_network_delegate.h" |
27 #include "chrome/test/base/testing_browser_process.h" | 28 #include "chrome/test/base/testing_browser_process.h" |
28 #include "chrome/test/base/testing_pref_service_syncable.h" | 29 #include "chrome/test/base/testing_pref_service_syncable.h" |
29 #include "chrome/test/base/testing_profile.h" | 30 #include "chrome/test/base/testing_profile.h" |
30 #include "chrome/test/base/testing_profile_manager.h" | 31 #include "chrome/test/base/testing_profile_manager.h" |
31 #include "content/public/common/url_constants.h" | 32 #include "content/public/common/url_constants.h" |
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 request->set_method(method); | 505 request->set_method(method); |
505 if (content_type != NULL) { | 506 if (content_type != NULL) { |
506 request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType, | 507 request->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType, |
507 content_type, | 508 content_type, |
508 true /* overwrite */); | 509 true /* overwrite */); |
509 } | 510 } |
510 ScopedVector<net::UploadElementReader> element_readers; | 511 ScopedVector<net::UploadElementReader> element_readers; |
511 element_readers.push_back(new net::UploadBytesElementReader( | 512 element_readers.push_back(new net::UploadBytesElementReader( |
512 &(bytes_1[0]), bytes_1.size())); | 513 &(bytes_1[0]), bytes_1.size())); |
513 element_readers.push_back( | 514 element_readers.push_back( |
514 new net::UploadFileElementReader(base::MessageLoopProxy::current().get(), | 515 new net::UploadFileElementReader( |
| 516 base::ThreadTaskRunnerHandle::Get() |
| 517 .get(), |
515 base::FilePath(), | 518 base::FilePath(), |
516 0, | 519 0, |
517 0, | 520 0, |
518 base::Time())); | 521 base::Time())); |
519 element_readers.push_back( | 522 element_readers.push_back( |
520 new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size())); | 523 new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size())); |
521 request->set_upload(make_scoped_ptr( | 524 request->set_upload(make_scoped_ptr( |
522 new net::ElementsUploadDataStream(element_readers.Pass(), 0))); | 525 new net::ElementsUploadDataStream(element_readers.Pass(), 0))); |
523 ipc_sender_.PushTask(base::Bind(&base::DoNothing)); | 526 ipc_sender_.PushTask(base::Bind(&base::DoNothing)); |
524 request->Start(); | 527 request->Start(); |
(...skipping 1702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2227 EXPECT_TRUE(credentials_set); | 2230 EXPECT_TRUE(credentials_set); |
2228 EXPECT_FALSE(auth3.Empty()); | 2231 EXPECT_FALSE(auth3.Empty()); |
2229 EXPECT_EQ(username, auth1.username()); | 2232 EXPECT_EQ(username, auth1.username()); |
2230 EXPECT_EQ(password, auth1.password()); | 2233 EXPECT_EQ(password, auth1.password()); |
2231 EXPECT_EQ(1u, warning_set.size()); | 2234 EXPECT_EQ(1u, warning_set.size()); |
2232 EXPECT_TRUE(HasWarning(warning_set, "extid2")); | 2235 EXPECT_TRUE(HasWarning(warning_set, "extid2")); |
2233 EXPECT_EQ(3u, capturing_net_log.GetSize()); | 2236 EXPECT_EQ(3u, capturing_net_log.GetSize()); |
2234 } | 2237 } |
2235 | 2238 |
2236 } // namespace extensions | 2239 } // namespace extensions |
OLD | NEW |