Index: content/browser/appcache/appcache_request_handler_unittest.cc |
diff --git a/content/browser/appcache/appcache_request_handler_unittest.cc b/content/browser/appcache/appcache_request_handler_unittest.cc |
index df6fb330d24d4afa23769b1aea6f846a7b5ce9d7..e8cc8f6adcbf0d9e95b1ff89d2a79b59838e2d6b 100644 |
--- a/content/browser/appcache/appcache_request_handler_unittest.cc |
+++ b/content/browser/appcache/appcache_request_handler_unittest.cc |
@@ -12,6 +12,10 @@ |
#include "base/message_loop/message_loop.h" |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/thread.h" |
+#include "content/browser/appcache/appcache.h" |
+#include "content/browser/appcache/appcache_backend_impl.h" |
+#include "content/browser/appcache/appcache_request_handler.h" |
+#include "content/browser/appcache/appcache_url_request_job.h" |
#include "content/browser/appcache/mock_appcache_policy.h" |
#include "content/browser/appcache/mock_appcache_service.h" |
#include "net/base/net_errors.h" |
@@ -22,21 +26,6 @@ |
#include "net/url_request/url_request_error_job.h" |
#include "net/url_request/url_request_job_factory.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-#include "webkit/browser/appcache/appcache.h" |
-#include "webkit/browser/appcache/appcache_backend_impl.h" |
-#include "webkit/browser/appcache/appcache_request_handler.h" |
-#include "webkit/browser/appcache/appcache_url_request_job.h" |
- |
-using appcache::AppCache; |
-using appcache::AppCacheBackendImpl; |
-using appcache::AppCacheEntry; |
-using appcache::AppCacheFrontend; |
-using appcache::AppCacheGroup; |
-using appcache::AppCacheHost; |
-using appcache::AppCacheInfo; |
-using appcache::AppCacheRequestHandler; |
-using appcache::AppCacheURLRequestJob; |
-using appcache::kAppCacheNoCacheId; |
namespace content { |
@@ -47,17 +36,17 @@ class AppCacheRequestHandlerTest : public testing::Test { |
class MockFrontend : public AppCacheFrontend { |
public: |
virtual void OnCacheSelected( |
- int host_id, const appcache::AppCacheInfo& info) OVERRIDE {} |
+ int host_id, const AppCacheInfo& info) OVERRIDE {} |
virtual void OnStatusChanged(const std::vector<int>& host_ids, |
- appcache::AppCacheStatus status) OVERRIDE {} |
+ AppCacheStatus status) OVERRIDE {} |
virtual void OnEventRaised(const std::vector<int>& host_ids, |
- appcache::AppCacheEventID event_id) OVERRIDE {} |
+ AppCacheEventID event_id) OVERRIDE {} |
virtual void OnErrorEventRaised( |
const std::vector<int>& host_ids, |
- const appcache::AppCacheErrorDetails& details) OVERRIDE {} |
+ const AppCacheErrorDetails& details) OVERRIDE {} |
virtual void OnProgressEventRaised(const std::vector<int>& host_ids, |
const GURL& url, |
@@ -66,7 +55,7 @@ class AppCacheRequestHandlerTest : public testing::Test { |
} |
virtual void OnLogMessage(int host_id, |
- appcache::AppCacheLogLevel log_level, |
+ AppCacheLogLevel log_level, |
const std::string& message) OVERRIDE { |
} |