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

Side by Side Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)
Patch Set: Change to android fix + compile error Created 4 years, 2 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 <stdint.h> 5 #include <stdint.h>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "content/browser/frame_host/cross_site_transferring_request.h"
14 #include "content/browser/frame_host/interstitial_page_impl.h" 13 #include "content/browser/frame_host/interstitial_page_impl.h"
15 #include "content/browser/frame_host/navigation_entry_impl.h" 14 #include "content/browser/frame_host/navigation_entry_impl.h"
16 #include "content/browser/frame_host/render_frame_host_impl.h" 15 #include "content/browser/frame_host/render_frame_host_impl.h"
17 #include "content/browser/frame_host/render_frame_proxy_host.h" 16 #include "content/browser/frame_host/render_frame_proxy_host.h"
18 #include "content/browser/media/audio_stream_monitor.h" 17 #include "content/browser/media/audio_stream_monitor.h"
19 #include "content/browser/media/media_web_contents_observer.h" 18 #include "content/browser/media/media_web_contents_observer.h"
20 #include "content/browser/renderer_host/render_view_host_impl.h" 19 #include "content/browser/renderer_host/render_view_host_impl.h"
21 #include "content/browser/site_instance_impl.h" 20 #include "content/browser/site_instance_impl.h"
22 #include "content/browser/ssl/ssl_policy.h" 21 #include "content/browser/ssl/ssl_policy.h"
23 #include "content/browser/webui/content_web_ui_controller_factory.h" 22 #include "content/browser/webui/content_web_ui_controller_factory.h"
(...skipping 3426 matching lines...) Expand 10 before | Expand all | Expand 10 after
3450 // An automatic navigation. 3449 // An automatic navigation.
3451 contents()->GetMainFrame()->SendNavigateWithModificationCallback( 3450 contents()->GetMainFrame()->SendNavigateWithModificationCallback(
3452 2, 0, true, GURL(url::kAboutBlankURL), base::Bind(SetAsNonUserGesture)); 3451 2, 0, true, GURL(url::kAboutBlankURL), base::Bind(SetAsNonUserGesture));
3453 3452
3454 EXPECT_EQ(1u, dialog_manager.reset_count()); 3453 EXPECT_EQ(1u, dialog_manager.reset_count());
3455 3454
3456 contents()->SetJavaScriptDialogManagerForTesting(nullptr); 3455 contents()->SetJavaScriptDialogManagerForTesting(nullptr);
3457 } 3456 }
3458 3457
3459 } // namespace content 3458 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698