| Index: content/browser/compositor/image_transport_factory_browsertest.cc
|
| diff --git a/content/browser/compositor/image_transport_factory_browsertest.cc b/content/browser/compositor/image_transport_factory_browsertest.cc
|
| index d4792fbe8d6ef04b1bc2c5831dd544f1b4a419e1..d53b1d72f5154c151564b9d2207eef9bd846d37c 100644
|
| --- a/content/browser/compositor/image_transport_factory_browsertest.cc
|
| +++ b/content/browser/compositor/image_transport_factory_browsertest.cc
|
| @@ -2,9 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "content/browser/compositor/image_transport_factory.h"
|
| +
|
| #include "base/run_loop.h"
|
| #include "cc/output/context_provider.h"
|
| -#include "content/browser/compositor/image_transport_factory.h"
|
| #include "content/browser/compositor/owned_mailbox.h"
|
| #include "content/public/browser/gpu_data_manager.h"
|
| #include "content/public/test/content_browser_test.h"
|
| @@ -16,7 +17,7 @@
|
| namespace content {
|
| namespace {
|
|
|
| -class ImageTransportFactoryBrowserTest : public ContentBrowserTest {};
|
| +typedef ContentBrowserTest ImageTransportFactoryBrowserTest;
|
|
|
| class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
|
| public:
|
| @@ -51,7 +52,7 @@ IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest,
|
| EXPECT_CALL(observer, OnLostResources())
|
| .WillOnce(testing::InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
|
|
|
| - ui::ContextFactory* context_factory = ui::ContextFactory::GetInstance();
|
| + ui::ContextFactory* context_factory = factory->GetContextFactory();
|
| gpu::gles2::GLES2Interface* gl =
|
| context_factory->SharedMainThreadContextProvider()->ContextGL();
|
| gl->LoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
|
|
|