Enable webgl conformance tests under content/test/gpu in content_browsertests

content/test/gpu/gpu_test_expectations_parser.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/test/gpu/gpu_test_expectations_parser.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 483 matching lines @@
 // static
 bool GPUTestExpectationsParser::GetExpectationsPath(
     GPUTestProfile profile, FilePath* path) {
   DCHECK(path);
 
   bool rt = true;
   switch (profile) {
     case kWebGLConformanceTest:
       rt = PathService::Get(base::DIR_SOURCE_ROOT, path);
       if (rt) {
-        *path = path->Append(FILE_PATH_LITERAL("chrome"))
+        *path = path->Append(FILE_PATH_LITERAL("content"))

[Zhenyao Mo, 2012/09/19 18:19:37]

Since we switch to use the content side version of the test_expectations.txt,
please remove the chrome side file.

[yongsheng, 2012/09/20 01:55:06]

ok, i'll do it.

             .Append(FILE_PATH_LITERAL("test"))
             .Append(FILE_PATH_LITERAL("gpu"))

[jam, 2012/09/19 19:52:40]

test data is normally put under content/test/data. any reason why this isn't
there? then you can use content::DIR_TEST_DATA

[yongsheng, 2012/09/20 01:55:06]

yes, i agree with you. Zheyao, if you agree with this, I'll move it to test data
dir.

             .Append(FILE_PATH_LITERAL(
                 "webgl_conformance_test_expectations.txt"));
         rt = file_util::PathExists(*path);
       }
       break;
     default:
       DCHECK(false);
   }
   return rt;
 }
 
 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
     : test_expectation(0),
       line_number(0) {
 }