GTTF: move chrome/browser/google_apis/test_server to net/test

chrome/browser/google_apis/test_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/google_apis/test_util.h"
 
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/pending_task.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/threading/sequenced_worker_pool.h"
 #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 {
 
 // This class is used to monitor if any task is posted to a message loop.
 class TaskObserver : public MessageLoop::TaskObserver {
  public:
   TaskObserver() : posted_(false) {}
   virtual ~TaskObserver() {}
 
@@ skipping 206 matching lines @@
   return result;
 }
 
 void TestGetContentCallback::OnGetContent(google_apis::GDataErrorCode error,
                                           scoped_ptr<std::string> data) {
   data_.push_back(data.release());
 }
 
 }  // namespace test_util
 }  // namespace google_apis