Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: content/test/mock_resource_context.h

Issue 9584023: Move MockResourceContext to content/test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/test/mock_resource_context.h
diff --git a/content/browser/mock_resource_context.h b/content/test/mock_resource_context.h
similarity index 78%
rename from content/browser/mock_resource_context.h
rename to content/test/mock_resource_context.h
index 417838c3154b5c6fa421e0f7bfb5dbd489a0c110..42f6df803fd53d16cf45365286a4d582004f951d 100644
--- a/content/browser/mock_resource_context.h
+++ b/content/test/mock_resource_context.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_MOCK_RESOURCE_CONTEXT_H_
-#define CONTENT_BROWSER_MOCK_RESOURCE_CONTEXT_H_
+#ifndef CONTENT_TEST_MOCK_RESOURCE_CONTEXT_H_
+#define CONTENT_TEST_MOCK_RESOURCE_CONTEXT_H_
+#pragma once
+#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "content/public/browser/resource_context.h"
-#include "net/url_request/url_request_context.h"
namespace content {
@@ -27,7 +27,7 @@ class MockResourceContext : public ResourceContext {
media_observer_ = observer;
}
- // ResourceContext implementation:
+ // Overridden from ResourceContext:
jam 2012/03/05 06:51:59 nit: no need to change this when moving the file,
tfarina 2012/03/05 12:40:34 Done.
virtual net::HostResolver* GetHostResolver() OVERRIDE;
virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
virtual MediaObserver* GetMediaObserver() OVERRIDE;
@@ -35,8 +35,10 @@ class MockResourceContext : public ResourceContext {
private:
scoped_refptr<net::URLRequestContext> test_request_context_;
MediaObserver* media_observer_;
+
+ DISALLOW_COPY_AND_ASSIGN(MockResourceContext);
};
} // namespace content
-#endif // CONTENT_BROWSER_MOCK_RESOURCE_CONTEXT_H_
+#endif // CONTENT_TEST_MOCK_RESOURCE_CONTEXT_H_

Powered by Google App Engine
This is Rietveld 408576698