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

Unified Diff: content/shell/renderer/shell_render_process_observer.h

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
Index: content/shell/renderer/shell_render_process_observer.h
diff --git a/content/shell/renderer/shell_render_process_observer.h b/content/shell/renderer/shell_render_process_observer.h
index ffe59e2ba4c5fd18e89a70542059c0fcf83e77be..1a42e8adbb21c6837df7766c12936364caa2e659 100644
--- a/content/shell/renderer/shell_render_process_observer.h
+++ b/content/shell/renderer/shell_render_process_observer.h
@@ -16,15 +16,12 @@ namespace blink {
class WebFrame;
}
-namespace WebTestRunner {
-class WebTestDelegate;
-class WebTestInterfaces;
-}
-
namespace content {
class RenderView;
class WebKitTestRunner;
+class WebTestDelegate;
+class WebTestInterfaces;
class ShellRenderProcessObserver : public RenderProcessObserver {
public:
@@ -33,7 +30,7 @@ class ShellRenderProcessObserver : public RenderProcessObserver {
ShellRenderProcessObserver();
virtual ~ShellRenderProcessObserver();
- void SetTestDelegate(WebTestRunner::WebTestDelegate* delegate);
+ void SetTestDelegate(WebTestDelegate* delegate);
void SetMainWindow(RenderView* view);
// RenderProcessObserver implementation.
@@ -41,10 +38,10 @@ class ShellRenderProcessObserver : public RenderProcessObserver {
virtual void OnRenderProcessShutdown() OVERRIDE;
virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
- WebTestRunner::WebTestDelegate* test_delegate() const {
+ WebTestDelegate* test_delegate() const {
return test_delegate_;
}
- WebTestRunner::WebTestInterfaces* test_interfaces() const {
+ WebTestInterfaces* test_interfaces() const {
return test_interfaces_.get();
}
WebKitTestRunner* main_test_runner() const { return main_test_runner_; }
@@ -56,8 +53,8 @@ class ShellRenderProcessObserver : public RenderProcessObserver {
void OnSetWebKitSourceDir(const base::FilePath& webkit_source_dir);
WebKitTestRunner* main_test_runner_;
- WebTestRunner::WebTestDelegate* test_delegate_;
- scoped_ptr<WebTestRunner::WebTestInterfaces> test_interfaces_;
+ WebTestDelegate* test_delegate_;
+ scoped_ptr<WebTestInterfaces> test_interfaces_;
base::FilePath webkit_source_dir_;
« no previous file with comments | « content/shell/renderer/shell_content_renderer_client.cc ('k') | content/shell/renderer/shell_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698