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

Side by Side Diff: content/browser/site_per_process_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
OLDNEW
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 "content/browser/site_per_process_browsertest.h" 5 #include "content/browser/site_per_process_browsertest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 11 matching lines...) Expand all
22 #include "base/sequenced_task_runner.h" 22 #include "base/sequenced_task_runner.h"
23 #include "base/single_thread_task_runner.h" 23 #include "base/single_thread_task_runner.h"
24 #include "base/strings/pattern.h" 24 #include "base/strings/pattern.h"
25 #include "base/strings/stringprintf.h" 25 #include "base/strings/stringprintf.h"
26 #include "base/strings/utf_string_conversions.h" 26 #include "base/strings/utf_string_conversions.h"
27 #include "base/test/test_timeouts.h" 27 #include "base/test/test_timeouts.h"
28 #include "base/threading/sequenced_task_runner_handle.h" 28 #include "base/threading/sequenced_task_runner_handle.h"
29 #include "base/threading/thread_task_runner_handle.h" 29 #include "base/threading/thread_task_runner_handle.h"
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "cc/input/touch_action.h" 31 #include "cc/input/touch_action.h"
32 #include "components/network_session_configurator/common/network_switches.h"
32 #include "content/browser/frame_host/cross_process_frame_connector.h" 33 #include "content/browser/frame_host/cross_process_frame_connector.h"
33 #include "content/browser/frame_host/frame_navigation_entry.h" 34 #include "content/browser/frame_host/frame_navigation_entry.h"
34 #include "content/browser/frame_host/frame_tree.h" 35 #include "content/browser/frame_host/frame_tree.h"
35 #include "content/browser/frame_host/interstitial_page_impl.h" 36 #include "content/browser/frame_host/interstitial_page_impl.h"
36 #include "content/browser/frame_host/navigation_controller_impl.h" 37 #include "content/browser/frame_host/navigation_controller_impl.h"
37 #include "content/browser/frame_host/navigation_entry_impl.h" 38 #include "content/browser/frame_host/navigation_entry_impl.h"
38 #include "content/browser/frame_host/navigator.h" 39 #include "content/browser/frame_host/navigator.h"
39 #include "content/browser/frame_host/render_frame_proxy_host.h" 40 #include "content/browser/frame_host/render_frame_proxy_host.h"
40 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 41 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
41 #include "content/browser/gpu/compositor_util.h" 42 #include "content/browser/gpu/compositor_util.h"
(...skipping 10152 matching lines...) Expand 10 before | Expand all | Expand 10 after
10194 // Go back again. This should go to foo.com. 10195 // Go back again. This should go to foo.com.
10195 { 10196 {
10196 TestNavigationObserver back_observer(web_contents()); 10197 TestNavigationObserver back_observer(web_contents());
10197 web_contents()->GetController().GoBack(); 10198 web_contents()->GetController().GoBack();
10198 back_observer.Wait(); 10199 back_observer.Wait();
10199 } 10200 }
10200 EXPECT_EQ(foo_url, web_contents()->GetMainFrame()->GetLastCommittedURL()); 10201 EXPECT_EQ(foo_url, web_contents()->GetMainFrame()->GetLastCommittedURL());
10201 } 10202 }
10202 10203
10203 } // namespace content 10204 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browsing_data/clear_site_data_throttle_browsertest.cc ('k') | content/browser/utility_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698