When --mpd is true, run _mpd variants first, then non-mpd.

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "nanobench.h"
@@ skipping 565 matching lines @@
                 SkDebugf("Can't parse %s from --scales as an SkScalar.\n", FLAGS_scales[i]);
                 exit(1);
             }
         }
 
         if (2 != sscanf(FLAGS_zoom[0], "%f,%d", &fZoomScale, &fZoomSteps)) {
             SkDebugf("Can't parse %s from --zoom as a scale,step.\n", FLAGS_zoom[0]);
             exit(1);
         }
 
-        fUseMPDs.push_back() = false;
         if (FLAGS_mpd) {
             fUseMPDs.push_back() = true;
         }
+        fUseMPDs.push_back() = false;
 
         // Prepare the images for decoding
         for (int i = 0; i < FLAGS_images.count(); i++) {
             const char* flag = FLAGS_images[i];
             if (sk_isdir(flag)) {
                 // If the value passed in is a directory, add all the images
                 SkOSFile::Iter it(flag);
                 SkString file;
                 while (it.next(&file)) {
                     fImages.push_back() = SkOSPath::Join(flag, file.c_str());
@@ skipping 500 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif