Improvements to uses of base::SmallMap

gpu/perftests/texture_upload_perftest.cc

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <vector>
@@ skipping 383 matching lines @@
       measurements.push_back(draw_timers.GetAsMeasurement("drawarrays"));
       measurements.push_back(finish_timers.GetAsMeasurement("finish"));
     }
     return measurements;
   }
 
   void RunUploadAndDrawMultipleTimes(const gfx::Size& size,
                                      const GLenum format,
                                      const bool subimage) {
     std::vector<uint8_t> pixels;
-    base::SmallMap<std::map<std::string, Measurement>>
+    base::small_map<std::map<std::string, Measurement>>

[danakj, 2017/04/18 21:35:50]

Seems overkill to use small_map in test code like this, it looks like flat_map
would work fine here.

         aggregates;  // indexed by name
     int successful_runs = 0;
     GLuint texture_id = CreateGLTexture(format, size, subimage);
     for (int i = 0; i < kUploadPerfWarmupRuns + kUploadPerfTestRuns; ++i) {
       GenerateTextureData(size, GLFormatBytePerPixel(format), i + 1, &pixels);
       auto run = UploadAndDraw(texture_id, size, pixels, format, subimage);
       if (i < kUploadPerfWarmupRuns || run.empty()) {
         continue;
       }
       successful_runs++;
@@ skipping 136 matching lines @@
                           gpu_timing_client_->CheckAndResetTimerErrors();
   if (!gpu_timer_errors) {
     upload_and_draw_timers.GetAsMeasurement("upload_and_draw")
         .PrintResult("renaming");
     finish_timers.GetAsMeasurement("finish").PrintResult("renaming");
   }
 }
 
 }  // namespace
 }  // namespace gpu