Revert 67293 BrowserTestCanLaunchWithOSMesa was consistently failing - Initia...

gpu/command_buffer/service/common_decoder.cc

 // Copyright (c) 2009 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/command_buffer/service/common_decoder.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
 
 namespace gpu {
 
 CommonDecoder::Bucket::Bucket() : size_(0) {}
@@ skipping 17 matching lines @@
 
 bool CommonDecoder::Bucket::SetData(
     const void* src, size_t offset, size_t size) {
   if (OffsetSizeValid(offset, size)) {
     memcpy(data_.get() + offset, src, size);
     return true;
   }
   return false;
 }
 
-void CommonDecoder::Bucket::SetFromString(const char* str) {
+void CommonDecoder::Bucket::SetFromString(const std::string& str) {
   // Strings are passed NULL terminated to distinguish between empty string
   // and no string.
-  if (!str) {
-    SetSize(0);
-  } else {
-    size_t size = strlen(str) + 1;
-    SetSize(size);
-    SetData(str, 0, size);
-  }
+  SetSize(str.size() + 1);
+  SetData(str.c_str(), 0, str.size() + 1);
 }
 
 bool CommonDecoder::Bucket::GetAsString(std::string* str) {
   DCHECK(str);
   if (size_ == 0) {
     return false;
   }
   str->assign(GetDataAs<const char*>(0, size_ - 1), size_ - 1);
   return true;
 }
@@ skipping 266 matching lines @@
   }
   const void* src = bucket->GetData(offset, size);
   if (!src) {
       return error::kInvalidArguments;
   }
   memcpy(data, src, size);
   return error::kNoError;
 }
 
 }  // namespace gpu