Fix rare race in ViEEncoderTest.UMACpuLimitedResolutionInPercent

webrtc/video/vie_encoder_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1039 matching lines @@
   vie_encoder_->TriggerCpuOveruse();
   for (int i = 1; i <= SendStatisticsProxy::kMinRequiredMetricsSamples; ++i) {
     video_source_.IncomingCapturedFrame(
         CreateFrame(SendStatisticsProxy::kMinRequiredMetricsSamples + i,
                     frame_width, frame_height));
     sink_.WaitForEncodedFrame(SendStatisticsProxy::kMinRequiredMetricsSamples +
                               i);
   }
 
   vie_encoder_->Stop();
+  vie_encoder_.reset();
+  stats_proxy_.reset();
 
-  stats_proxy_.reset();
   EXPECT_EQ(1,
             metrics::NumSamples("WebRTC.Video.CpuLimitedResolutionInPercent"));
   EXPECT_EQ(
       1, metrics::NumEvents("WebRTC.Video.CpuLimitedResolutionInPercent", 50));
 }
 
 TEST_F(ViEEncoderTest, CallsBitrateObserver) {
   class MockBitrateObserver : public VideoBitrateAllocationObserver {
    public:
     MOCK_METHOD1(OnBitrateAllocationUpdated, void(const BitrateAllocation&));
@@ skipping 155 matching lines @@
 
   // Trigger CPU normal use, return to original resoluton;
   vie_encoder_->TriggerCpuNormalUsage();
   video_source_.IncomingCapturedFrame(
       CreateFrame(3, kFrameWidth, kFrameHeight));
   sink_.WaitForEncodedFrame(kFrameWidth, kFrameHeight);
 
   vie_encoder_->Stop();
 }
 }  // namespace webrtc