Removes redundant test

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 42 matching lines @@
         main_loop_(NULL),
         view_manager_(NULL),
         quit_count_(0),
         router_(NULL) {
     SetInstance(this);
   }
 
   virtual ~ViewManagerProxy() {
   }
 
+  // Returns true if in an initial state. If this returns false it means the
+  // last test didn't clean up properly, or most likely didn't invoke
+  // WaitForInstance() when it needed to.
+  static bool IsInInitialState() { return instance_ == NULL; }
+
   // Runs a message loop until the single instance has been created.
   static ViewManagerProxy* WaitForInstance() {
     if (!instance_)
       RunMainLoop();
     ViewManagerProxy* instance = instance_;
     instance_ = NULL;
     return instance;
   }
 
   ViewManagerService* view_manager() { return view_manager_; }
@@ skipping 369 matching lines @@
 typedef std::vector<std::string> Changes;
 
 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_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new EmbedApplicationLoader()),
         GURL(kTestServiceURL));
 
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new EmbedApplicationLoader()),
         GURL(kTestServiceURL2));
 
@@ skipping 702 matching lines @@
   // Should get nothing for view 2.
   connection2_->GetViewTree(BuildViewId(1, 2), &views);
   ASSERT_TRUE(views.empty());
 
   // Should get view 1 if asked for.
   connection2_->GetViewTree(BuildViewId(1, 1), &views);
   ASSERT_EQ(1u, views.size());
   EXPECT_EQ("view=1,1 parent=null", views[0].ToString());
 }
 
-TEST_F(ViewManagerTest, ConnectTwice) {
-  ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
-  ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 2)));
-
-  ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
-
-  // Try to connect again to 1,1, this should fail as already connected to that
-  // root.
-  ASSERT_TRUE(connection_->Embed(BuildViewId(1, 1), kTestServiceURL));
-
-  // Connecting to 1,2 should succeed and end up in connection2.
-  {
-    ASSERT_TRUE(connection_->Embed(BuildViewId(1, 2), kTestServiceURL));
-    connection2_->DoRunLoopUntilChangesCount(1);
-    const Changes changes(ChangesToDescription1(connection2_->changes()));
-    ASSERT_EQ(1u, changes.size());
-    EXPECT_EQ("ViewDeleted view=1,1", changes[0]);
-  }
-}
-
 TEST_F(ViewManagerTest, OnViewInput) {
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   // Dispatch an event to the view and verify its received.
   {
     EventPtr event(Event::New());
     event->action = static_cast<EventType>(1);
     connection_->view_manager()->DispatchOnViewInputEvent(BuildViewId(1, 1),
                                                           event.Pass());
@@ skipping 230 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