chrome/browser/chromeos/app_mode/fake_cws.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

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/chromeos/app_mode/fake_cws.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 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 | « chrome/browser/chromeos/app_mode/fake_cws.h ('k') | chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/app_mode/fake_cws.cc

diff --git a/chrome/browser/chromeos/app_mode/fake_cws.cc b/chrome/browser/chromeos/app_mode/fake_cws.cc

index e8c798da2f2d1c0cf2f425607a7fd39a58ebaf21..a1f25c4adb5d26ccfbaa91f1eb06d286db037c92 100644

--- a/chrome/browser/chromeos/app_mode/fake_cws.cc

+++ b/chrome/browser/chromeos/app_mode/fake_cws.cc

@@ -18,7 +18,6 @@

#include "net/test/embedded_test_server/embedded_test_server.h"

using net::test_server::BasicHttpResponse;

-using net::test_server::EmbeddedTestServer;

using net::test_server::HttpRequest;

using net::test_server::HttpResponse;

@@ -76,7 +75,7 @@ FakeCWS::FakeCWS() : update_check_count_(0) {

FakeCWS::~FakeCWS() {

}

-void FakeCWS::Init(EmbeddedTestServer* embedded_test_server) {

+void FakeCWS::Init(net::EmbeddedTestServer* embedded_test_server) {

has_update_template_ = kAppHasUpdateTemplate;

no_update_template_ = kAppNoUpdateTemplate;

update_check_end_point_ = "/update_check.xml";

@@ -87,7 +86,7 @@ void FakeCWS::Init(EmbeddedTestServer* embedded_test_server) {

base::Bind(&FakeCWS::HandleRequest, base::Unretained(this)));

}

-void FakeCWS::InitAsPrivateStore(EmbeddedTestServer* embedded_test_server,

+void FakeCWS::InitAsPrivateStore(net::EmbeddedTestServer* embedded_test_server,

const std::string& update_check_end_point) {

has_update_template_ = kPrivateStoreAppHasUpdateTemplate;

no_update_template_ = kAppNoUpdateTemplate;