chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc - Issue 541743002: Move url_request_mock_http_job to net/test/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/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

Issue 541743002: Move url_request_mock_http_job to net/test/url_request/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed one unmatched brace Created 6 years, 3 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/errorpage_browsertest.cc ('k') | chrome/browser/lifetime/browser_close_manager_browsertest.cc » ('j') | net/test/url_request/url_request_mock_http_job.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

index 6e6c0068eccbc9efc38a7c3929f85ad4a0eb33d6..d7682c8dd08ddb2f209902765b8811b1ecacbbb8 100644

--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

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

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

#include "content/public/common/content_switches.h"

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

-#include "content/test/net/url_request_mock_http_job.h"

#include "crypto/nss_util_internal.h"

#include "crypto/scoped_test_system_nss_key_slot.h"

#include "extensions/browser/notification_types.h"

#include "net/base/net_errors.h"

#include "net/cert/nss_cert_database.h"

+#include "net/test/url_request/url_request_mock_http_job.h"

#include "policy/policy_constants.h"

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

@@ -253,7 +253,7 @@ class EnterprisePlatformKeysTest : public ExtensionApiTest {

base::FilePath update_manifest_path =

base::FilePath(kTestExtensionDir).Append(kUpdateManifestFileName);

GURL update_manifest_url(

- content::URLRequestMockHTTPJob::GetMockUrl(update_manifest_path));

+ net::URLRequestMockHTTPJob::GetMockUrl(update_manifest_path));

scoped_ptr<base::ListValue> forcelist(new base::ListValue);

forcelist->AppendString(base::StringPrintf(