Fix gles2_conform_test failures when Mac switching to core profile

gpu/gles2_conform_support/gles2_conform_test.cc

 // Copyright (c) 2013 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/gles2_conform_support/gles2_conform_test.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 93 matching lines @@
   PathService::Get(base::DIR_EXE, &test_path);
   base::FilePath program(test_path.Append(FILE_PATH_LITERAL(
       "gles2_conform_test_windowless")));
 
   base::CommandLine cmd_line(program);
   cmd_line.AppendArguments(*current_cmd_line, false);
   cmd_line.AppendSwitch(std::string("--"));
   cmd_line.AppendArg(std::string("-run=") + path);
 
   std::string output;
-  bool success = base::GetAppOutput(cmd_line, &output);
+  bool success = base::GetAppOutputAndError(cmd_line, &output);
   if (success) {
     size_t success_index = output.find("Conformance PASSED all");
     size_t failed_index = output.find("FAILED");
     success = (success_index != std::string::npos) &&
               (failed_index == std::string::npos);
   }
   if (!success) {
     LOG(ERROR) << output;
   }
   return success;
 }
 
 int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
   ::testing::InitGoogleTest(&argc, argv);
   base::TestSuite test_suite(argc, argv);
   int rt = base::LaunchUnitTestsSerially(
       argc,
       argv,
       base::Bind(&RunHelper, base::Unretained(&test_suite)));
   return rt;
 }