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

Side by Side Diff: chrome/browser/ui/views/payments/payment_request_browsertest_base.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/ui/startup/bad_flags_prompt.cc ('k') | chrome/common/BUILD.gn » ('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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "chrome/browser/ui/views/payments/payment_request_browsertest_base.h" 5 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iostream> 8 #include <iostream>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/ui/views/payments/editor_view_controller.h" 24 #include "chrome/browser/ui/views/payments/editor_view_controller.h"
25 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h" 25 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
26 #include "chrome/browser/ui/views/payments/validating_combobox.h" 26 #include "chrome/browser/ui/views/payments/validating_combobox.h"
27 #include "chrome/browser/ui/views/payments/validating_textfield.h" 27 #include "chrome/browser/ui/views/payments/validating_textfield.h"
28 #include "chrome/browser/ui/views/payments/view_stack.h" 28 #include "chrome/browser/ui/views/payments/view_stack.h"
29 #include "chrome/test/base/ui_test_utils.h" 29 #include "chrome/test/base/ui_test_utils.h"
30 #include "components/autofill/core/browser/address_combobox_model.h" 30 #include "components/autofill/core/browser/address_combobox_model.h"
31 #include "components/autofill/core/browser/autofill_profile.h" 31 #include "components/autofill/core/browser/autofill_profile.h"
32 #include "components/autofill/core/browser/credit_card.h" 32 #include "components/autofill/core/browser/credit_card.h"
33 #include "components/autofill/core/browser/personal_data_manager.h" 33 #include "components/autofill/core/browser/personal_data_manager.h"
34 #include "components/network_session_configurator/common/network_switches.h"
34 #include "components/payments/content/payment_request.h" 35 #include "components/payments/content/payment_request.h"
35 #include "components/payments/content/payment_request_web_contents_manager.h" 36 #include "components/payments/content/payment_request_web_contents_manager.h"
36 #include "components/web_modal/web_contents_modal_dialog_manager.h" 37 #include "components/web_modal/web_contents_modal_dialog_manager.h"
37 #include "content/public/browser/render_frame_host.h" 38 #include "content/public/browser/render_frame_host.h"
38 #include "content/public/browser/web_contents.h" 39 #include "content/public/browser/web_contents.h"
39 #include "content/public/common/content_switches.h" 40 #include "content/public/common/content_switches.h"
40 #include "content/public/test/browser_test_utils.h" 41 #include "content/public/test/browser_test_utils.h"
41 #include "net/dns/mock_host_resolver.h" 42 #include "net/dns/mock_host_resolver.h"
42 #include "services/service_manager/public/cpp/bind_source_info.h" 43 #include "services/service_manager/public/cpp/bind_source_info.h"
43 #include "services/service_manager/public/cpp/binder_registry.h" 44 #include "services/service_manager/public/cpp/binder_registry.h"
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 break; 821 break;
821 case DialogEvent::NOT_SUPPORTED_ERROR: 822 case DialogEvent::NOT_SUPPORTED_ERROR:
822 out << "NOT_SUPPORTED_ERROR"; 823 out << "NOT_SUPPORTED_ERROR";
823 break; 824 break;
824 case DialogEvent::ABORT_CALLED: 825 case DialogEvent::ABORT_CALLED:
825 out << "ABORT_CALLED"; 826 out << "ABORT_CALLED";
826 break; 827 break;
827 } 828 }
828 return out; 829 return out;
829 } 830 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/bad_flags_prompt.cc ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698