chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 15069003: Rename the embedded test server to EmbeddedTestServer in net::test_server namespace.

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/login/kiosk_browsertest.cc

Issue 15069003: Rename the embedded test server to EmbeddedTestServer in net::test_server namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit Created 7 years, 7 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/chromeos/contacts/gdata_contacts_service_unittest.cc ('k') | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/kiosk_browsertest.cc

diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc

index 230bea0a6a31d1af1b65f7ed7141036677488248..b32aee12eb3d5f58169158f60e27a803ea4bf218 100644

--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc

+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -38,14 +38,13 @@

#include "google_apis/gaia/gaia_switches.h"

#include "net/base/host_port_pair.h"

#include "net/dns/mock_host_resolver.h"

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

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

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

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

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

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

-using namespace google_apis;

-using namespace google_apis::test_server;

+using namespace net::test_server;

namespace chromeos {