summaryrefslogtreecommitdiffstats
path: root/chrome/browser/google_apis/test_util.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 17:50:26 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 17:50:26 +0000
commitb6e5b6c6feec3301c6e74ae76e1df1762b150c3a (patch)
tree2c69567a4b2ca6b86d4e563e05dd3cbfcee4160a /chrome/browser/google_apis/test_util.cc
parent04e51aa91468b3ad25e36ab7ac712be285495104 (diff)
downloadchromium_src-b6e5b6c6feec3301c6e74ae76e1df1762b150c3a.zip
chromium_src-b6e5b6c6feec3301c6e74ae76e1df1762b150c3a.tar.gz
chromium_src-b6e5b6c6feec3301c6e74ae76e1df1762b150c3a.tar.bz2
GTTF: move chrome/browser/google_apis/test_server to net/test
This is a part of replacing most usages of the Python test server with an in-process C++ test server that should be easier to debug. BUG=96594 R=rch@chromium.org, satorux@chromium.org Review URL: https://codereview.chromium.org/14971002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google_apis/test_util.cc')
-rw-r--r--chrome/browser/google_apis/test_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/google_apis/test_util.cc b/chrome/browser/google_apis/test_util.cc
index 93d592b..8115f5a 100644
--- a/chrome/browser/google_apis/test_util.cc
+++ b/chrome/browser/google_apis/test_util.cc
@@ -19,10 +19,10 @@
#include "chrome/browser/google_apis/drive_api_parser.h"
#include "chrome/browser/google_apis/gdata_wapi_operations.h"
#include "chrome/browser/google_apis/gdata_wapi_parser.h"
-#include "chrome/browser/google_apis/test_server/http_request.h"
-#include "chrome/browser/google_apis/test_server/http_response.h"
#include "content/public/browser/browser_thread.h"
#include "googleurl/src/gurl.h"
+#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
namespace google_apis {
namespace test_util {