content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc - Issue 11293017: Move navigation interception component to content/components

Unified Diff: content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

Issue 11293017: Move navigation interception component to content/components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add findbugs suppression for compatibility code. Created 8 years, 1 month 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

« no previous file with comments | « content/components/navigation_interception/intercept_navigation_resource_throttle.cc ('k') | content/components/navigation_interception/java/src/org/chromium/content/components/navigation_interception/InterceptNavigationDelegate.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

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

similarity index 97%

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

rename to content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

index f26053abb646f7ecbda8d0b99b2eb0f5dfde5397..ccbb3a6886946f4908c09031ae3cd131ab6b086f 100644

--- a/chrome/browser/component/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

+++ b/content/components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc

@@ -7,8 +7,7 @@

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

#include "base/synchronization/waitable_event.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/components/navigation_interception/intercept_navigation_resource_throttle.h"

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

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

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

@@ -20,12 +19,12 @@

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

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

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

+#include "content/public/test/test_renderer_host.h"

#include "net/url_request/url_request.h"

#include "testing/gmock/include/gmock/gmock.h"

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

using namespace content;

-using namespace navigation_interception;

using namespace ::testing;

namespace {

@@ -138,7 +137,7 @@ class TestIOThreadState {

// InterceptNavigationResourceThrottleTest ------------------------------------

class InterceptNavigationResourceThrottleTest

- : public ChromeRenderViewHostTestHarness {

+ : public RenderViewHostTestHarness {

public:

InterceptNavigationResourceThrottleTest()

: mock_callback_receiver_(new MockInterceptCallbackReceiver()),

@@ -148,7 +147,7 @@ class InterceptNavigationResourceThrottleTest

}

virtual void SetUp() OVERRIDE {

- ChromeRenderViewHostTestHarness::SetUp();

+ RenderViewHostTestHarness::SetUp();

io_thread_.StartIOThread();

}