| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/memory/ptr_util.h" | 6 #include "base/memory/ptr_util.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 9 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
| 10 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 10 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 gpu::ContextSupport* context_support_ = nullptr; | 93 gpu::ContextSupport* context_support_ = nullptr; |
| 94 | 94 |
| 95 private: | 95 private: |
| 96 scoped_refptr<content::ContextProviderCommandBuffer> provider_; | 96 scoped_refptr<content::ContextProviderCommandBuffer> provider_; |
| 97 }; | 97 }; |
| 98 | 98 |
| 99 } // namespace | 99 } // namespace |
| 100 | 100 |
| 101 // Include the shared tests. | 101 // Include the shared tests. |
| 102 #define CONTEXT_TEST_F IN_PROC_BROWSER_TEST_F | 102 #define CONTEXT_TEST_F IN_PROC_BROWSER_TEST_F |
| 103 #include "content/common/gpu/client/gpu_context_tests.h" | 103 #include "gpu/ipc/client/gpu_context_tests.h" |
| 104 | 104 |
| 105 namespace content { | 105 namespace content { |
| 106 | 106 |
| 107 class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest { | 107 class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest { |
| 108 public: | 108 public: |
| 109 void SetUpOnMainThread() override { | 109 void SetUpOnMainThread() override { |
| 110 if (!BrowserGpuChannelHostFactory::CanUseForTesting()) | 110 if (!BrowserGpuChannelHostFactory::CanUseForTesting()) |
| 111 return; | 111 return; |
| 112 | 112 |
| 113 // Start all tests without a gpu channel so that the tests exercise a | 113 // Start all tests without a gpu channel so that the tests exercise a |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 shim->SimulateCrash(); | 292 shim->SimulateCrash(); |
| 293 run_loop.Run(); | 293 run_loop.Run(); |
| 294 | 294 |
| 295 EXPECT_EQ(1, counter); | 295 EXPECT_EQ(1, counter); |
| 296 EXPECT_FALSE(IsChannelEstablished()); | 296 EXPECT_FALSE(IsChannelEstablished()); |
| 297 EstablishAndWait(); | 297 EstablishAndWait(); |
| 298 EXPECT_TRUE(IsChannelEstablished()); | 298 EXPECT_TRUE(IsChannelEstablished()); |
| 299 } | 299 } |
| 300 | 300 |
| 301 } // namespace content | 301 } // namespace content |
| OLD | NEW |