Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: UseRealGLBindings for CompositingRWHVBrowserTests on win_rel Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/singleton.h" 6 #include "base/memory/singleton.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 virtual void SetUp() OVERRIDE { 241 virtual void SetUp() OVERRIDE {
242 // Override factory to create tests instances of BrowserPlugin*. 242 // Override factory to create tests instances of BrowserPlugin*.
243 content::BrowserPluginEmbedder::set_factory_for_testing( 243 content::BrowserPluginEmbedder::set_factory_for_testing(
244 TestBrowserPluginHostFactory::GetInstance()); 244 TestBrowserPluginHostFactory::GetInstance());
245 content::BrowserPluginGuest::set_factory_for_testing( 245 content::BrowserPluginGuest::set_factory_for_testing(
246 TestBrowserPluginHostFactory::GetInstance()); 246 TestBrowserPluginHostFactory::GetInstance());
247 content::BrowserPluginGuestManager::set_factory_for_testing( 247 content::BrowserPluginGuestManager::set_factory_for_testing(
248 TestBrowserPluginHostFactory::GetInstance()); 248 TestBrowserPluginHostFactory::GetInstance());
249 249
250 UseRealGLBindings();
251
250 ContentBrowserTest::SetUp(); 252 ContentBrowserTest::SetUp();
251 } 253 }
252 virtual void TearDown() OVERRIDE { 254 virtual void TearDown() OVERRIDE {
253 content::BrowserPluginEmbedder::set_factory_for_testing(NULL); 255 content::BrowserPluginEmbedder::set_factory_for_testing(NULL);
254 content::BrowserPluginGuest::set_factory_for_testing(NULL); 256 content::BrowserPluginGuest::set_factory_for_testing(NULL);
255 257
256 ContentBrowserTest::TearDown(); 258 ContentBrowserTest::TearDown();
257 } 259 }
258 260
259 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 261 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 // in the guest. 932 // in the guest.
931 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, VerifyInputMethodActive) { 933 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, VerifyInputMethodActive) {
932 const char* kEmbedderURL = "/browser_plugin_embedder.html"; 934 const char* kEmbedderURL = "/browser_plugin_embedder.html";
933 StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, std::string()); 935 StartBrowserPluginTest(kEmbedderURL, kHTMLForGuest, true, std::string());
934 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( 936 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
935 test_guest()->web_contents()->GetRenderViewHost()); 937 test_guest()->web_contents()->GetRenderViewHost());
936 EXPECT_TRUE(rvh->input_method_active()); 938 EXPECT_TRUE(rvh->input_method_active());
937 } 939 }
938 940
939 } // namespace content 941 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/aura/image_transport_factory.cc ('k') | content/browser/gpu/gpu_info_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698