| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/public/test/test_renderer_host.h" | 5 #include "content/public/test/test_renderer_host.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" | 
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" | 
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 262 | 262 | 
| 263 #if defined(OS_WIN) | 263 #if defined(OS_WIN) | 
| 264   ole_initializer_.reset(new ui::ScopedOleInitializer()); | 264   ole_initializer_.reset(new ui::ScopedOleInitializer()); | 
| 265 #endif | 265 #endif | 
| 266 #if defined(USE_AURA) | 266 #if defined(USE_AURA) | 
| 267   ui::ContextFactory* context_factory = | 267   ui::ContextFactory* context_factory = | 
| 268       ImageTransportFactory::GetInstance()->GetContextFactory(); | 268       ImageTransportFactory::GetInstance()->GetContextFactory(); | 
| 269   ui::ContextFactoryPrivate* context_factory_private = | 269   ui::ContextFactoryPrivate* context_factory_private = | 
| 270       ImageTransportFactory::GetInstance()->GetContextFactoryPrivate(); | 270       ImageTransportFactory::GetInstance()->GetContextFactoryPrivate(); | 
| 271 | 271 | 
| 272   aura_test_helper_.reset( | 272   aura_test_helper_.reset(new aura::test::AuraTestHelper()); | 
| 273       new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); |  | 
| 274   aura_test_helper_->SetUp(context_factory, context_factory_private); | 273   aura_test_helper_->SetUp(context_factory, context_factory_private); | 
| 275   new wm::DefaultActivationClient(aura_test_helper_->root_window()); | 274   new wm::DefaultActivationClient(aura_test_helper_->root_window()); | 
| 276 #endif | 275 #endif | 
| 277 | 276 | 
| 278   sanity_checker_.reset(new ContentBrowserSanityChecker()); | 277   sanity_checker_.reset(new ContentBrowserSanityChecker()); | 
| 279 | 278 | 
| 280   DCHECK(!browser_context_); | 279   DCHECK(!browser_context_); | 
| 281   browser_context_.reset(CreateBrowserContext()); | 280   browser_context_.reset(CreateBrowserContext()); | 
| 282 | 281 | 
| 283   SetContents(CreateTestWebContents()); | 282   SetContents(CreateTestWebContents()); | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 325 | 324 | 
| 326 void RenderViewHostTestHarness::SetRenderProcessHostFactory( | 325 void RenderViewHostTestHarness::SetRenderProcessHostFactory( | 
| 327     RenderProcessHostFactory* factory) { | 326     RenderProcessHostFactory* factory) { | 
| 328   if (rvh_test_enabler_) | 327   if (rvh_test_enabler_) | 
| 329     rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory); | 328     rvh_test_enabler_->rvh_factory_->set_render_process_host_factory(factory); | 
| 330   else | 329   else | 
| 331     factory_ = factory; | 330     factory_ = factory; | 
| 332 } | 331 } | 
| 333 | 332 | 
| 334 }  // namespace content | 333 }  // namespace content | 
| OLD | NEW | 
|---|