chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc - Issue 10946008: Componentize IgnoreNavigationResourceThrottle and add chrome and webview specific implementations.

Unified Diff: chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

Issue 10946008: Componentize IgnoreNavigationResourceThrottle and add chrome and webview specific implementations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixed presubmit warning for jni_generator.py Created 8 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 side-by-side diff with in-line comments

Download patch

« android_webview/javatests/src/org/chromium/android_webview/test/util/TestWebServer.java ('K') | « chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle.cc ('k') | chrome/browser/component/navigation_interception/java/src/org/chromium/chrome/browser/component/navigation_interception/InterceptNavigationDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

diff --git a/chrome/browser/renderer_host/intercept_navigation_resource_throttle_unittest.cc b/chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

similarity index 97%

rename from chrome/browser/renderer_host/intercept_navigation_resource_throttle_unittest.cc

rename to chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

index c2e76931e56a3c9c1e88446abeb225891aae47ca..9835f0d5dae02030fc0574fd9822c4e051d3c131 100644

--- a/chrome/browser/renderer_host/intercept_navigation_resource_throttle_unittest.cc

+++ b/chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

@@ -6,15 +6,15 @@

#include "base/bind_helpers.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

-#include "chrome/browser/renderer_host/intercept_navigation_resource_throttle.h"

+#include "chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle.h"

#include "chrome/test/base/chrome_render_view_host_test_harness.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/resource_context.h"

+#include "content/public/browser/resource_controller.h"

#include "content/public/browser/resource_dispatcher_host.h"

#include "content/public/browser/resource_dispatcher_host_delegate.h"

#include "content/public/browser/resource_request_info.h"

#include "content/public/browser/resource_throttle.h"

-#include "content/public/browser/resource_controller.h"

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

#include "content/public/browser/web_contents_delegate.h"

#include "content/public/test/mock_resource_context.h"

@@ -24,6 +24,7 @@

#include "testing/gtest/include/gtest/gtest.h"

using namespace content;

+using namespace navigation_interception;

using namespace ::testing;

namespace {

@@ -47,7 +48,7 @@ class MockInterceptCallbackReceiver {

MOCK_METHOD4(ShouldIgnoreNavigation, bool(RenderViewHost* source,

const GURL& url,

const content::Referrer& referrer,

- bool is_content_initiated));

+ bool has_user_gesture));

};

// MockResourceController -----------------------------------------------------