Revert "Move test cases for more natural ordering"

talk/media/base/videoengine_unittest.h

 /*
  * libjingle
  * Copyright 2014 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 22 matching lines @@
 
 #include "talk/media/base/fakenetworkinterface.h"
 #include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/base/fakevideorenderer.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/streamparams.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/timeutils.h"
 
+#ifdef WIN32
+#include <objbase.h>  // NOLINT
+#endif
+
 #define EXPECT_FRAME_WAIT(c, w, h, t) \
   EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \
   EXPECT_EQ((w), renderer_.width()); \
   EXPECT_EQ((h), renderer_.height()); \
   EXPECT_EQ(0, renderer_.errors()); \
 
 #define EXPECT_FRAME_ON_RENDERER_WAIT(r, c, w, h, t) \
   EXPECT_EQ_WAIT((c), (r).num_rendered_frames(), (t)); \
   EXPECT_EQ((w), (r).width()); \
   EXPECT_EQ((h), (r).height()); \
@@ skipping 75 matching lines @@
  protected:
   // Tests starting and stopping the engine, and creating a channel.
   void StartupShutdown() {
     EXPECT_TRUE(engine_.Init(rtc::Thread::Current()));
     cricket::VideoMediaChannel* channel = engine_.CreateChannel(NULL);
     EXPECT_TRUE(channel != NULL);
     delete channel;
     engine_.Terminate();
   }
 
+#ifdef WIN32
+  // Tests that the COM reference count is not munged by the engine.
+  // Test to make sure LMI does not munge the CoInitialize reference count.
+  void CheckCoInitialize() {
+    // Initial refcount should be 0.
+    EXPECT_EQ(S_OK, CoInitializeEx(NULL, COINIT_MULTITHREADED));
+
+    // Engine should start even with COM already inited.
+    EXPECT_TRUE(engine_.Init(rtc::Thread::Current()));
+    engine_.Terminate();
+    // Refcount after terminate should be 1; this tests if it is nonzero.
+    EXPECT_EQ(S_FALSE, CoInitializeEx(NULL, COINIT_MULTITHREADED));
+    // Decrement refcount to (hopefully) 0.
+    CoUninitialize();
+    CoUninitialize();
+
+    // Ensure refcount is 0.
+    EXPECT_EQ(S_OK, CoInitializeEx(NULL, COINIT_MULTITHREADED));
+    CoUninitialize();
+  }
+#endif
+
   void ConstrainNewCodecBody() {
     cricket::VideoCodec empty, in, out;
     cricket::VideoCodec max_settings(engine_.codecs()[0].id,
                                      engine_.codecs()[0].name,
                                      1280, 800, 30, 0);
 
     // set max settings of 1280x800x30
     EXPECT_TRUE(engine_.SetDefaultEncoderConfig(
         cricket::VideoEncoderConfig(max_settings)));
 
@@ skipping 1732 matching lines @@
   rtc::scoped_ptr<C> channel_;
   cricket::FakeNetworkInterface network_interface_;
   cricket::FakeVideoRenderer renderer_;
   cricket::VideoMediaChannel::Error media_error_;
 
   // Used by test cases where 2 streams are run on the same channel.
   cricket::FakeVideoRenderer renderer2_;
 };
 
 #endif  // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_  NOLINT