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

Side by Side Diff: content/child/web_url_loader_impl_unittest.cc

Issue 1544293002: Convert Pass()→std::move() in //content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « content/child/web_url_loader_impl.cc ('k') | content/child/webmessageportchannel_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/child/web_url_loader_impl.h" 5 #include "content/child/web_url_loader_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string.h> 8 #include <string.h>
9 #include <utility>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/command_line.h" 12 #include "base/command_line.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
14 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
15 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
16 #include "base/time/time.h" 17 #include "base/time/time.h"
17 #include "components/scheduler/child/web_task_runner_impl.h" 18 #include "components/scheduler/child/web_task_runner_impl.h"
18 #include "content/child/request_extra_data.h" 19 #include "content/child/request_extra_data.h"
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 blink::WebURLRequest request; 686 blink::WebURLRequest request;
686 request.initialize(); 687 request.initialize();
687 request.setURL(GURL(kTestURL)); 688 request.setURL(GURL(kTestURL));
688 request.setFrameType(blink::WebURLRequest::FrameTypeTopLevel); 689 request.setFrameType(blink::WebURLRequest::FrameTypeTopLevel);
689 request.setRequestContext(blink::WebURLRequest::RequestContextFrame); 690 request.setRequestContext(blink::WebURLRequest::RequestContextFrame);
690 scoped_ptr<StreamOverrideParameters> stream_override( 691 scoped_ptr<StreamOverrideParameters> stream_override(
691 new StreamOverrideParameters()); 692 new StreamOverrideParameters());
692 stream_override->stream_url = kStreamURL; 693 stream_override->stream_url = kStreamURL;
693 stream_override->response.mime_type = kMimeType; 694 stream_override->response.mime_type = kMimeType;
694 RequestExtraData* extra_data = new RequestExtraData(); 695 RequestExtraData* extra_data = new RequestExtraData();
695 extra_data->set_stream_override(stream_override.Pass()); 696 extra_data->set_stream_override(std::move(stream_override));
696 request.setExtraData(extra_data); 697 request.setExtraData(extra_data);
697 base::CommandLine::ForCurrentProcess()->AppendSwitch( 698 base::CommandLine::ForCurrentProcess()->AppendSwitch(
698 switches::kEnableBrowserSideNavigation); 699 switches::kEnableBrowserSideNavigation);
699 700
700 client()->loader()->loadAsynchronously(request, client()); 701 client()->loader()->loadAsynchronously(request, client());
701 702
702 // The stream url should have been requestead instead of the request url. 703 // The stream url should have been requestead instead of the request url.
703 ASSERT_TRUE(peer()); 704 ASSERT_TRUE(peer());
704 EXPECT_EQ(kStreamURL, dispatcher()->url()); 705 EXPECT_EQ(kStreamURL, dispatcher()->url());
705 706
706 EXPECT_FALSE(client()->did_receive_response()); 707 EXPECT_FALSE(client()->did_receive_response());
707 peer()->OnReceivedResponse(content::ResourceResponseInfo()); 708 peer()->OnReceivedResponse(content::ResourceResponseInfo());
708 EXPECT_TRUE(client()->did_receive_response()); 709 EXPECT_TRUE(client()->did_receive_response());
709 710
710 // The response info should have been overriden. 711 // The response info should have been overriden.
711 ASSERT_FALSE(client()->response().isNull()); 712 ASSERT_FALSE(client()->response().isNull());
712 EXPECT_EQ(kMimeType, client()->response().mimeType().latin1()); 713 EXPECT_EQ(kMimeType, client()->response().mimeType().latin1());
713 714
714 DoReceiveData(); 715 DoReceiveData();
715 DoCompleteRequest(); 716 DoCompleteRequest();
716 EXPECT_FALSE(dispatcher()->canceled()); 717 EXPECT_FALSE(dispatcher()->canceled());
717 EXPECT_EQ(kTestData, client()->received_data()); 718 EXPECT_EQ(kTestData, client()->received_data());
718 } 719 }
719 720
720 } // namespace 721 } // namespace
721 } // namespace content 722 } // namespace content
OLDNEW
« no previous file with comments | « content/child/web_url_loader_impl.cc ('k') | content/child/webmessageportchannel_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698