Merge Conflict Fix CL to lmp-mr1-release for ag/849478

DO NOT MERGE - libvpx: Pull from upstream

Current HEAD: 7105df53d7dc13d5e575bc8df714ec8d1da36b06

BUG=23452792

Change-Id: Ic78176fc369e0bacc71d423e0e2e6075d004aaec

void EncoderTest::SetMode(TestMode mode) {
 switch (mode) {
 case kRealTime:
      deadline_ = VPX_DL_REALTIME;
 break;

 case kOnePassGood:
 case kTwoPassGood:
      deadline_ = VPX_DL_GOOD_QUALITY;
 break;

 case kOnePassBest:
 case kTwoPassBest:
      deadline_ = VPX_DL_BEST_QUALITY;
 break;

 default:
      ASSERT_TRUE(false) << "Unexpected mode " << mode;
 }

 if (mode == kTwoPassGood || mode == kTwoPassBest)
    passes_ = 2;
 else
    passes_ = 1;
}

void EncoderTest::SetMode(TestMode mode) {
 switch (mode) {
 case kRealTime:
      deadline_ = VPX_DL_REALTIME;
 break;

 case kOnePassGood:
 case kTwoPassGood:
      deadline_ = VPX_DL_GOOD_QUALITY;
 break;

 case kOnePassBest:
 case kTwoPassBest:
      deadline_ = VPX_DL_BEST_QUALITY;
 break;

 default:
      ASSERT_TRUE(false) << "Unexpected mode " << mode;
 }

 if (mode == kTwoPassGood || mode == kTwoPassBest)
    passes_ = 2;
 else
    passes_ = 1;
}
