diff options
Diffstat (limited to 'chrome/browser/policy/device_management_service_browsertest.cc')
| -rw-r--r-- | chrome/browser/policy/device_management_service_browsertest.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc index 6c07e9e..feed86f 100644 --- a/chrome/browser/policy/device_management_service_browsertest.cc +++ b/chrome/browser/policy/device_management_service_browsertest.cc @@ -3,11 +3,10 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/policy/device_management_backend_mock.h" #include "chrome/browser/policy/device_management_service.h" #include "chrome/browser/policy/proto/device_management_constants.h" -#include "chrome/browser/profile.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/in_process_browser_test.h" #include "net/test/test_server.h" @@ -43,22 +42,22 @@ const char kServiceResponseUnregister[] = #define PROTO_STRING(name) (std::string(name, arraysize(name) - 1)) // Interceptor implementation that returns test data back to the service. -class CannedResponseInterceptor : public URLRequest::Interceptor { +class CannedResponseInterceptor : public net::URLRequest::Interceptor { public: CannedResponseInterceptor(const GURL& service_url, const std::string& response_data) : service_url_(service_url), response_data_(response_data) { - URLRequest::RegisterRequestInterceptor(this); + net::URLRequest::RegisterRequestInterceptor(this); } virtual ~CannedResponseInterceptor() { - URLRequest::UnregisterRequestInterceptor(this); + net::URLRequest::UnregisterRequestInterceptor(this); } private: - // URLRequest::Interceptor overrides. - virtual URLRequestJob* MaybeIntercept(URLRequest* request) { + // net::URLRequest::Interceptor overrides. + virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) { if (request->url().GetOrigin() == service_url_.GetOrigin() && request->url().path() == service_url_.path()) { return new URLRequestTestJob(request, |