chrome/browser/payments/site_per_process_payments_browsertest.cc - Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/payments/site_per_process_payments_browsertest.cc

Issue 2914893002: Move some of IOThread's command line logic to network_session_configurator. (Closed)

Patch Set: Fix merge Created 3 years, 6 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 | « chrome/browser/io_thread.cc ('k') | chrome/browser/policy/policy_network_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/command_line.h"	5 #include "base/command_line.h"

6 #include "chrome/browser/ui/browser.h"	6 #include "chrome/browser/ui/browser.h"

7 #include "chrome/browser/ui/browser_tabstrip.h"	7 #include "chrome/browser/ui/browser_tabstrip.h"

8 #include "chrome/browser/ui/tabs/tab_strip_model.h"	8 #include "chrome/browser/ui/tabs/tab_strip_model.h"

9 #include "chrome/test/base/in_process_browser_test.h"	9 #include "chrome/test/base/in_process_browser_test.h"

10 #include "chrome/test/base/ui_test_utils.h"	10 #include "chrome/test/base/ui_test_utils.h"

	11 #include "components/network_session_configurator/common/network_switches.h"

11 #include "content/public/browser/render_frame_host.h"	12 #include "content/public/browser/render_frame_host.h"

12 #include "content/public/browser/render_view_host.h"	13 #include "content/public/browser/render_view_host.h"

13 #include "content/public/browser/render_widget_host_view.h"	14 #include "content/public/browser/render_widget_host_view.h"

14 #include "content/public/browser/web_contents.h"	15 #include "content/public/browser/web_contents.h"

15 #include "content/public/common/content_switches.h"	16 #include "content/public/common/content_switches.h"

16 #include "content/public/test/browser_test_utils.h"	17 #include "content/public/test/browser_test_utils.h"

17 #include "content/public/test/test_utils.h"	18 #include "content/public/test/test_utils.h"

18 #include "net/dns/mock_host_resolver.h"	19 #include "net/dns/mock_host_resolver.h"

19 #include "net/test/embedded_test_server/embedded_test_server.h"	20 #include "net/test/embedded_test_server/embedded_test_server.h"

20 #include "url/gurl.h"	21 #include "url/gurl.h"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 https_server_->GetURL("b.com", "/payment_request_iframe.html");	65 https_server_->GetURL("b.com", "/payment_request_iframe.html");

65 EXPECT_TRUE(content::NavigateIframeToURL(tab, "test", iframe_url));	66 EXPECT_TRUE(content::NavigateIframeToURL(tab, "test", iframe_url));

66	67

67 EXPECT_TRUE(tab->GetRenderWidgetHostView()->IsShowing());	68 EXPECT_TRUE(tab->GetRenderWidgetHostView()->IsShowing());

68 content::RenderFrameHost* frame = ChildFrameAt(tab->GetMainFrame(), 0);	69 content::RenderFrameHost* frame = ChildFrameAt(tab->GetMainFrame(), 0);

69 EXPECT_TRUE(frame);	70 EXPECT_TRUE(frame);

70 EXPECT_NE(frame->GetSiteInstance(), tab->GetMainFrame()->GetSiteInstance());	71 EXPECT_NE(frame->GetSiteInstance(), tab->GetMainFrame()->GetSiteInstance());

71 }	72 }

72	73

73 } // namespace payments	74 } // namespace payments

OLD	NEW