Index: content/public/test/test_launcher.h |
=================================================================== |
--- content/public/test/test_launcher.h (revision 163460) |
+++ content/public/test/test_launcher.h (working copy) |
@@ -19,10 +19,7 @@ |
namespace content { |
class ContentMainDelegate; |
-} |
-namespace test_launcher { |
- |
extern const char kEmptyTestName[]; |
extern const char kGTestFilterFlag[]; |
extern const char kGTestHelpFlag[]; |
@@ -47,7 +44,7 @@ |
const FilePath& temp_data_dir) = 0; |
virtual void PreRunMessageLoop(base::RunLoop* run_loop) {} |
virtual void PostRunMessageLoop() {} |
- virtual content::ContentMainDelegate* CreateContentMainDelegate() = 0; |
+ virtual ContentMainDelegate* CreateContentMainDelegate() = 0; |
protected: |
virtual ~TestLauncherDelegate(); |
@@ -59,6 +56,6 @@ |
TestLauncherDelegate* GetCurrentTestLauncherDelegate(); |
-} // namespace test_launcher |
+} // namespace content |
#endif // CONTENT_PUBLIC_TEST_TEST_LAUNCHER_H_ |