chrome/browser/safe_browsing/client_side_detection_service_unittest.cc - Issue 10581012: Move test_url_fetcher_factory.* from content/ to net/url_request

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

Issue 10581012: Move test_url_fetcher_factory.* from content/ to net/url_request (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove export annotations Created 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/policy/testing_policy_url_fetcher_factory.cc ('k') | chrome/browser/safe_browsing/download_protection_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

index 84d74e5e17d20a6bc385445c0b2e2cd3e72642e3..8e9b7308af1ee753d479902810fa83558509f0a0 100644

--- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

+++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc

@@ -16,9 +16,9 @@

#include "chrome/common/safe_browsing/client_model.pb.h"

#include "chrome/common/safe_browsing/csd.pb.h"

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

-#include "content/public/test/test_url_fetcher_factory.h"

#include "crypto/sha2.h"

#include "googleurl/src/gurl.h"

+#include "net/url_request/test_url_fetcher_factory.h"

#include "net/url_request/url_request_status.h"

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

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

@@ -65,7 +65,7 @@ class ClientSideDetectionServiceTest : public testing::Test {

file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE,

&msg_loop_));

- factory_.reset(new FakeURLFetcherFactory());

+ factory_.reset(new net::FakeURLFetcherFactory());

browser_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,

&msg_loop_));

@@ -190,7 +190,7 @@ class ClientSideDetectionServiceTest : public testing::Test {

protected:

scoped_ptr<ClientSideDetectionService> csd_service_;

- scoped_ptr<FakeURLFetcherFactory> factory_;

+ scoped_ptr<net::FakeURLFetcherFactory> factory_;

MessageLoop msg_loop_;

private: