| Index: chrome/browser/policy/device_management_service_unittest.cc
|
| diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc
|
| index 01f6740285a3d9af077d94e50f72ab96bbbd15b4..0c3c24227ce9312ec5f2e2a2a2f7cee58fc3d0d9 100644
|
| --- a/chrome/browser/policy/device_management_service_unittest.cc
|
| +++ b/chrome/browser/policy/device_management_service_unittest.cc
|
| @@ -11,7 +11,7 @@
|
| #include "chrome/browser/policy/device_management_service.h"
|
| #include "chrome/browser/policy/proto/device_management_constants.h"
|
| #include "content/browser/browser_thread.h"
|
| -#include "content/common/test_url_fetcher_factory.h"
|
| +#include "content/test/test_url_fetcher_factory.h"
|
| #include "net/base/escape.h"
|
| #include "net/url_request/url_request_status.h"
|
| #include "net/url_request/url_request_test_util.h"
|
| @@ -50,15 +50,11 @@ class DeviceManagementServiceTestBase : public TESTBASE {
|
| InitializeService();
|
| }
|
|
|
| - virtual void SetUp() {
|
| - URLFetcher::set_factory(&factory_);
|
| - }
|
| -
|
| virtual void TearDown() {
|
| - URLFetcher::set_factory(NULL);
|
| backend_.reset();
|
| service_.reset();
|
| loop_.RunAllPending();
|
| + TESTBASE::TearDown();
|
| }
|
|
|
| void ResetService() {
|
|
|