compositor: Put CompositorTestSuite into a namespace.

Other test suites, i.e, ui/app_list/test, ui/aura/test, ui/test/, are already
in a namespace.

R=piman@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10914055

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154713 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 24 insertions, 10 deletions

diff --git a/ui/compositor/run_all_unittests.cc b/ui/compositor/run_all_unittests.cc
index 4c3f006..52bb2fa 100644
--- a/ui/compositor/run_all_unittests.cc
+++ b/ui/compositor/run_all_unittests.cc
@@ -5,5 +5,5 @@
 #include "ui/compositor/test/test_suite.h"
 
 int main(int argc, char** argv) {
-  return CompositorTestSuite(argc, argv).Run();
+  return ui::test::CompositorTestSuite(argc, argv).Run();
 }
diff --git a/ui/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc
index 80b9930..5b2f052 100644
--- a/ui/compositor/test/test_suite.cc
+++ b/ui/compositor/test/test_suite.cc
@@ -11,6 +11,9 @@
 #include "ui/gfx/gfx_paths.h"
 #include "ui/gl/gl_implementation.h"
 
+namespace ui {
+namespace test {
+
 CompositorTestSuite::CompositorTestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
@@ -25,14 +28,17 @@ void CompositorTestSuite::Initialize() {
   gfx::RegisterPathProvider();
 
   message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
-  ui::CompositorTestSupport::Initialize();
-  ui::Compositor::Initialize(false);
+  CompositorTestSupport::Initialize();
+  Compositor::Initialize(false);
 }
 
 void CompositorTestSuite::Shutdown() {
-  ui::Compositor::Terminate();
-  ui::CompositorTestSupport::Terminate();
+  Compositor::Terminate();
+  CompositorTestSupport::Terminate();
   message_loop_.reset();
 
   base::TestSuite::Shutdown();
 }
+
+}  // namespace test
+}  // namespace ui
diff --git a/ui/compositor/test/test_suite.h b/ui/compositor/test/test_suite.h
index cd64f38..239e004 100644
--- a/ui/compositor/test/test_suite.h
+++ b/ui/compositor/test/test_suite.h
@@ -2,27 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_GFX_COMPOSITOR_TEST_TEST_SUITE_H_
-#define UI_GFX_COMPOSITOR_TEST_TEST_SUITE_H_
+#ifndef UI_COMPOSITOR_TEST_TEST_SUITE_H_
+#define UI_COMPOSITOR_TEST_TEST_SUITE_H_
 
+#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_suite.h"
 
 class MessageLoop;
 
+namespace ui {
+namespace test {
+
 class CompositorTestSuite : public base::TestSuite {
  public:
   CompositorTestSuite(int argc, char** argv);
   virtual ~CompositorTestSuite();
 
- protected:
+ private:
   // base::TestSuite:
   virtual void Initialize() OVERRIDE;
   virtual void Shutdown() OVERRIDE;
 
- private:
   scoped_ptr<MessageLoop> message_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(CompositorTestSuite);
 };
 
-#endif  // UI_GFX_COMPOSITOR_TEST_TEST_SUITE_H_
+}  // namespace test
+}  // namespace ui
+
+#endif  // UI_COMPOSITOR_TEST_TEST_SUITE_H_