chrome/browser/translate/translate_manager_browsertest.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/translate/translate_manager_browsertest.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/sync/test/integration/sync_test.cc ('k') | chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/translate/translate_manager_browsertest.cc

diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc

index 80d3dc67c6652af0bfa49ef95da55122d2ebc06d..a6fa7a3621f51bc32cdc5b21330311fdcba3a41c 100644

--- a/chrome/browser/translate/translate_manager_browsertest.cc

+++ b/chrome/browser/translate/translate_manager_browsertest.cc

@@ -39,13 +39,13 @@

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

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

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

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

#include "grit/generated_resources.h"

#include "ipc/ipc_test_sink.h"

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

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

+#include "third_party/cld/languages/public/languages.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

-#include "third_party/cld/languages/public/languages.h"

using content::BrowserThread;

using content::NavigationController;

@@ -200,7 +200,7 @@ class TranslateManagerTest : public TabContentsTestHarness,

}

void SimulateTranslateScriptURLFetch(bool success) {

- TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);

+ net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);

ASSERT_TRUE(fetcher);

net::URLRequestStatus status;

status.set_status(success ? net::URLRequestStatus::SUCCESS :

@@ -213,7 +213,7 @@ class TranslateManagerTest : public TabContentsTestHarness,

void SimulateSupportedLanguagesURLFetch(

bool success, const std::vector<std::string>& languages) {

- TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(1);

+ net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(1);

ASSERT_TRUE(fetcher);

net::URLRequestStatus status;

status.set_status(success ? net::URLRequestStatus::SUCCESS :

@@ -252,7 +252,7 @@ class TranslateManagerTest : public TabContentsTestHarness,

private:

content::NotificationRegistrar notification_registrar_;

- TestURLFetcherFactory url_fetcher_factory_;

+ net::TestURLFetcherFactory url_fetcher_factory_;

content::TestBrowserThread ui_thread_;

content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox

webkit_platform_support_;