Fix some test expectations for IPC tests

ipc/ipc_channel_proxy_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 "build/build_config.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 
@@ skipping 147 matching lines @@
   }
 
   void OnChannelError() override {
     EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
     last_filter_event_ = CHANNEL_ERROR;
   }
 
   void OnChannelClosing() override {
     // We may or may not have gotten OnChannelError; if not, the last event has
     // to be OnChannelConnected.
+    EXPECT_NE(FILTER_REMOVED, last_filter_event_);
     if (last_filter_event_ != CHANNEL_ERROR)
       EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
     last_filter_event_ = CHANNEL_CLOSING;
   }
 
   void OnFilterRemoved() override {
-    // If the channel didn't get a chance to connect, we might see the
-    // OnFilterRemoved event with no other events preceding it. We still want
-    // OnFilterRemoved to be called to allow for deleting the Filter.
-    if (last_filter_event_ != NONE)
-      EXPECT_EQ(CHANNEL_CLOSING, last_filter_event_);
+    // A filter may be removed at any time, even before the channel is connected
+    // (and thus before OnFilterAdded is ever able to dispatch.) The only time
+    // we won't see OnFilterRemoved is immediately after OnFilterAdded, because
+    // OnChannelConnected is always the next event to fire after that.
+    EXPECT_NE(FILTER_ADDED, last_filter_event_);
     last_filter_event_ = FILTER_REMOVED;
   }
 
   bool OnMessageReceived(const IPC::Message& message) override {
     // We should always get the OnFilterAdded and OnChannelConnected events
     // prior to any messages.
     EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
 
     if (!is_global_filter_) {
       EXPECT_EQ(supported_message_class_, IPC_MESSAGE_CLASS(message));
@@ skipping 242 matching lines @@
       IPCTestBase::GetChannelName("ChannelProxyClient"), &listener,
       main_message_loop.task_runner()));
   CHECK(channel->Connect());
   listener.Init(channel.get());
 
   base::RunLoop().Run();
   return 0;
 }
 
 }  // namespace