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

Unified Diff: content/shell/renderer/test_runner/test_runner.cc

Issue 264003003: test_runner: Move everything else into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « content/shell/renderer/test_runner/test_runner.h ('k') | content/shell/renderer/webkit_test_runner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/test_runner/test_runner.cc
diff --git a/content/shell/renderer/test_runner/test_runner.cc b/content/shell/renderer/test_runner/test_runner.cc
index 5a0bc05ae9f22f38bd81690dca13d0d32cb82b96..73c7fac16ab6331546d2bc93a2c8e7e211fd62b5 100644
--- a/content/shell/renderer/test_runner/test_runner.cc
+++ b/content/shell/renderer/test_runner/test_runner.cc
@@ -47,7 +47,8 @@
#endif
using namespace blink;
-using namespace WebTestRunner;
+
+namespace content {
namespace {
@@ -58,12 +59,11 @@ WebString V8StringToWebString(v8::Handle<v8::String> v8_str) {
return WebString::fromUTF8(chars.get());
}
-class HostMethodTask :
- public ::WebTestRunner::WebMethodTask<content::TestRunner> {
+class HostMethodTask : public WebMethodTask<TestRunner> {
public:
- typedef void (content::TestRunner::*CallbackMethodType)();
- HostMethodTask(content::TestRunner* object, CallbackMethodType callback)
- : WebMethodTask<content::TestRunner>(object), callback_(callback) {}
+ typedef void (TestRunner::*CallbackMethodType)();
+ HostMethodTask(TestRunner* object, CallbackMethodType callback)
+ : WebMethodTask<TestRunner>(object), callback_(callback) {}
virtual void runIfValid() OVERRIDE {
(m_object->*callback_)();
@@ -75,13 +75,10 @@ class HostMethodTask :
} // namespace
-namespace content {
-
-class InvokeCallbackTask : public WebMethodTask<content::TestRunner> {
+class InvokeCallbackTask : public WebMethodTask<TestRunner> {
public:
- InvokeCallbackTask(content::TestRunner* object,
- v8::Handle<v8::Function> callback)
- : WebMethodTask<content::TestRunner>(object),
+ InvokeCallbackTask(TestRunner* object, v8::Handle<v8::Function> callback)
+ : WebMethodTask<TestRunner>(object),
callback_(blink::mainThreadIsolate(), callback) {}
virtual void runIfValid() OVERRIDE {
@@ -1353,7 +1350,7 @@ TestRunner::TestRunner(TestInterfaces* interfaces)
web_view_(NULL),
page_overlay_(NULL),
web_permissions_(new WebPermissions()),
- notification_presenter_(new content::NotificationPresenter()),
+ notification_presenter_(new NotificationPresenter()),
weak_factory_(this) {}
TestRunner::~TestRunner() {}
« no previous file with comments | « content/shell/renderer/test_runner/test_runner.h ('k') | content/shell/renderer/webkit_test_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698