Deregister window classes

mojo/services/view_manager/view_manager_unittest.cc

Index: mojo/services/view_manager/view_manager_unittest.cc
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc
index a6ceca8c2087bb58796a03d2fdffdd156daf1750..259fd1eb0670be0251623aa65a860f9e2aca7f5f 100644
--- a/mojo/services/view_manager/view_manager_unittest.cc
+++ b/mojo/services/view_manager/view_manager_unittest.cc
@@ -31,6 +31,10 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/rect.h"
 
+#if defined(OS_WIN)
+#include "ui/gfx/win/window_impl.h"
+#endif
+
 namespace mojo {
 namespace service {
 
@@ -432,6 +436,10 @@ class ViewManagerTest : public testing::Test {
         connection3_(NULL) {}
 
   virtual void SetUp() OVERRIDE {
+#if defined(OS_WIN)
+    // Ensure that all window classes are destroyed at end of each test.
+    gfx::WindowImpl::SetUnregisterClassesAtExit(true);

[Bernhard Bauer, 2014/09/11 08:45:06]

This relies somewhat on the fact that there is an AtExitManager, and that it
will be destroyed at the right time. It would be good if we could more directly
control when the classes are unregistered, e.g. with a scoped object. Or at
least, we could schedule this via AtExitManager::RegisterTask(), which will
check that there is an AtExitManager.

[DaveMoore, 2014/09/12 04:27:28]

Changed it to use RegisterTask() instead.

On 2014/09/11 08:45:06, Bernhard Bauer wrote:

+#endif
     test_helper_.Init();
 
     test_helper_.SetLoaderForURL(
@@ -533,13 +541,8 @@ TEST_F(ViewManagerTest, MultipleEmbedRootsBeforeWTHReady) {
 }
 
 // Verifies client gets a valid id.
-#if defined(OS_LINUX)
 // http://crbug.com/396492
-#define MAYBE_ValidId DISABLED_ValidId
-#else
-#define MAYBE_ValidId ValidId
-#endif
-TEST_F(ViewManagerTest, MAYBE_ValidId) {
+TEST_F(ViewManagerTest, DISABLED_ValidId) {

[Bernhard Bauer, 2014/09/11 08:45:06]

What's this about?

[DaveMoore, 2014/09/12 04:27:28]

Accident. I'll submit the view_manager_unittests changes separately.
On 2014/09/11 08:45:06, Bernhard Bauer wrote:

   // TODO(beng): this should really have the URL of the application that
   //             connected to ViewManagerInit.
   EXPECT_EQ("OnEmbed creator=",