Change uses of base::JoinString to pass StringPieces where possible.

gpu/config/gpu_util.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 "gpu/config/gpu_util.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_blacklist.h"
 #include "gpu/config/gpu_control_list_jsons.h"
 #include "gpu/config/gpu_driver_bug_list.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_finch_features.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
@@ skipping 75 matching lines @@
                  GpuControlList::kCurrentOsOnly);
   std::set<int> workarounds = list->MakeDecision(
       GpuControlList::kOsAny, std::string(), gpu_info);
   GpuDriverBugList::AppendWorkaroundsFromCommandLine(
       &workarounds, *command_line);
   if (!workarounds.empty()) {
     command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds,
                                     IntSetToString(workarounds));
   }
 
-  std::set<std::string> disabled_extensions;
   std::vector<std::string> buglist_disabled_extensions =
       list->GetDisabledExtensions();
-  disabled_extensions.insert(buglist_disabled_extensions.begin(),
-                             buglist_disabled_extensions.end());
+  std::set<base::StringPiece> disabled_extensions(
+      buglist_disabled_extensions.begin(), buglist_disabled_extensions.end());
 
+  // Must be outside if statement to remain in scope (referenced by
+  // |disabled_extensions|).
+  std::string command_line_disable_gl_extensions;
   if (command_line->HasSwitch(switches::kDisableGLExtensions)) {
-    std::vector<std::string> existing_disabled_extensions = base::SplitString(
-        command_line->GetSwitchValueASCII(switches::kDisableGLExtensions), " ",
-        base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+    command_line_disable_gl_extensions =
+        command_line->GetSwitchValueASCII(switches::kDisableGLExtensions);
+    std::vector<base::StringPiece> existing_disabled_extensions =
+        base::SplitStringPiece(command_line_disable_gl_extensions, " ",
+                               base::TRIM_WHITESPACE,
+                               base::SPLIT_WANT_NONEMPTY);
     disabled_extensions.insert(existing_disabled_extensions.begin(),
                                existing_disabled_extensions.end());
   }
 
   if (!disabled_extensions.empty()) {
-    std::vector<std::string> v(disabled_extensions.begin(),
-                               disabled_extensions.end());
+    std::vector<base::StringPiece> v(disabled_extensions.begin(),
+                                     disabled_extensions.end());
     command_line->AppendSwitchASCII(switches::kDisableGLExtensions,
                                     base::JoinString(v, " "));
   }
 }
 
 void StringToFeatureSet(
     const std::string& str, std::set<int>* feature_set) {
   StringToIntSet(str, feature_set);
 }
 
@@ skipping 58 matching lines @@
   }
 
   // Currently only used for GPU rasterization.
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_GPU_RASTERIZATION] =
       GetGpuRasterizationFeatureStatus(blacklisted_features, command_line);
 
   return gpu_feature_info;
 }
 
 }  // namespace gpu