Clean up naming of paint-related identifiers

content/renderer/gpu/gpu_benchmarking_extension.cc

 // Copyright (c) 2012 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 "content/renderer/gpu/gpu_benchmarking_extension.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 121 matching lines @@
     // Let skia register known effect subclasses. This basically enables
     // reflection on those subclasses required for picture serialization.
     SkiaBenchmarking::Initialize();
   }
 
   // Recursively serializes the layer tree.
   // Each layer in the tree is serialized into a separate skp file
   // in the given directory.
   void Serialize(const cc::Layer* root_layer) {
     for (auto* layer : *root_layer->layer_tree_host()) {
-      sk_sp<SkPicture> picture = cc::ToSkPicture(layer->GetPicture());
+      sk_sp<SkPicture> picture = layer->GetPicture();
       if (!picture)
         continue;
 
       // Serialize picture to file.
       // TODO(alokp): Note that for this to work Chrome needs to be launched
       // with
       // --no-sandbox command-line flag. Get rid of this limitation.
       // CRBUG: 139640.
       std::string filename = "layer_" + base::IntToString(layer_id_++) + ".skp";
       std::string filepath = dirpath_.AppendASCII(filename).MaybeAsASCII();
@@ skipping 947 matching lines @@
           &gpu_driver_bug_workarounds))) {
     return;
   }
 
   v8::Local<v8::Value> result;
   if (gin::TryConvertToV8(args->isolate(), gpu_driver_bug_workarounds, &result))
     args->Return(result);
 }
 
 }  // namespace content