| Index: chrome/test/gpu/gpu_feature_browsertest.cc
|
| diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| index 8a6af169af580e2cf72bbe7149b4cf9c85a21406..9f620775acd53319715df2f8a9dc88f56ffecd3d 100644
|
| --- a/chrome/test/gpu/gpu_feature_browsertest.cc
|
| +++ b/chrome/test/gpu/gpu_feature_browsertest.cc
|
| @@ -187,8 +187,10 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_AcceleratedCompositingAllowed) {
|
|
|
| class AcceleratedCompositingBlockedTest : public GpuFeatureTest {
|
| public:
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| - GpuFeatureTest::SetUpInProcessBrowserTestFixture();
|
| + // Override the blacklist after browser initialization has completed, just
|
| + // before launching the actual test.
|
| + virtual void SetUpOnMainThread() OVERRIDE {
|
| + GpuFeatureTest::SetUpOnMainThread();
|
| const std::string json_blacklist =
|
| "{\n"
|
| " \"name\": \"gpu blacklist\",\n"
|
|
|