Second attempt to land change to remove NativeViewportService and

mojo/services/view_manager/view_manager_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 13 matching lines @@
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/test_change_tracker.h"
 #include "mojo/shell/shell_test_helper.h"
 #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 {
 
 namespace {
 
 const char kTestServiceURL[] = "mojo:test_url";
 const char kTestServiceURL2[] = "mojo:test_url2";
 
 // ViewManagerProxy is a proxy to an ViewManagerService. It handles invoking
 // ViewManagerService functions on the right thread in a synchronous manner
@@ skipping 404 matching lines @@
 
 class ViewManagerTest : public testing::Test {
  public:
   ViewManagerTest()
       : connection_(NULL),
         connection2_(NULL),
         connection3_(NULL) {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(ViewManagerProxy::IsInInitialState());
+    test_helper_.Init();
 
-    test_helper_.Init();
+#if defined(OS_WIN)
+    // As we unload the wndproc of window classes we need to be sure to
+    // unregister them.
+    gfx::WindowImpl::UnregisterClassesAtExit();
+#endif
 
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new EmbedApplicationLoader()),
         GURL(kTestServiceURL));
 
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new EmbedApplicationLoader()),
         GURL(kTestServiceURL2));
 
     test_helper_.application_manager()->ConnectToService(
@@ skipping 79 matching lines @@
 }
 
 TEST_F(ViewManagerTest, MultipleEmbedRootsBeforeWTHReady) {
   ASSERT_TRUE(InitEmbed(view_manager_init_.get(), kTestServiceURL, 2));
   connection_->DoRunLoopUntilChangesCount(2);
   EXPECT_EQ(kTestServiceURL, connection_->changes()[0].embed_url);
   EXPECT_EQ(kTestServiceURL, connection_->changes()[1].embed_url);
 }
 
 // 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) {
   // TODO(beng): this should really have the URL of the application that
   //             connected to ViewManagerInit.
   EXPECT_EQ("OnEmbed creator=",
             ChangesToDescription1(connection_->changes())[0]);
 
   // All these tests assume 1 for the client id. The only real assertion here is
   // the client id is not zero, but adding this as rest of code here assumes 1.
   EXPECT_EQ(1, connection_->changes()[0].connection_id);
 }
 
@@ skipping 845 matching lines @@
 
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification.
 
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 }  // namespace service
 }  // namespace mojo