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

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

Issue 22797008: Force delegated renderer on Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix whitespace Created 7 years, 3 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
« no previous file with comments | « chrome/test/gpu/gpu_feature_browsertest.cc ('k') | content/browser/gpu/compositor_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 TestBrowserPluginHostFactory::GetInstance()); 246 TestBrowserPluginHostFactory::GetInstance());
247 content::BrowserPluginGuest::set_factory_for_testing( 247 content::BrowserPluginGuest::set_factory_for_testing(
248 TestBrowserPluginHostFactory::GetInstance()); 248 TestBrowserPluginHostFactory::GetInstance());
249 content::BrowserPluginGuestManager::set_factory_for_testing( 249 content::BrowserPluginGuestManager::set_factory_for_testing(
250 TestBrowserPluginHostFactory::GetInstance()); 250 TestBrowserPluginHostFactory::GetInstance());
251 251
252 // On legacy windows, the AcceptDragEvents test needs this to pass. 252 // On legacy windows, the AcceptDragEvents test needs this to pass.
253 #if defined(OS_WIN) && !defined(USE_AURA) 253 #if defined(OS_WIN) && !defined(USE_AURA)
254 UseRealGLBindings(); 254 UseRealGLBindings();
255 #endif 255 #endif
256 // We need real contexts, otherwise the embedder doesn't composite, but the
257 // guest does, and that isn't an expected configuration.
258 UseRealGLContexts();
256 259
257 ContentBrowserTest::SetUp(); 260 ContentBrowserTest::SetUp();
258 } 261 }
259 virtual void TearDown() OVERRIDE { 262 virtual void TearDown() OVERRIDE {
260 content::BrowserPluginEmbedder::set_factory_for_testing(NULL); 263 content::BrowserPluginEmbedder::set_factory_for_testing(NULL);
261 content::BrowserPluginGuest::set_factory_for_testing(NULL); 264 content::BrowserPluginGuest::set_factory_for_testing(NULL);
262 265
263 ContentBrowserTest::TearDown(); 266 ContentBrowserTest::TearDown();
264 } 267 }
265 268
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 // should be blocked because the scheme isn't web-safe or a pseudo-scheme. 840 // should be blocked because the scheme isn't web-safe or a pseudo-scheme.
838 ExecuteSyncJSFunction( 841 ExecuteSyncJSFunction(
839 test_embedder()->web_contents()->GetRenderViewHost(), 842 test_embedder()->web_contents()->GetRenderViewHost(),
840 base::StringPrintf("SetSrc('%s://abc123');", 843 base::StringPrintf("SetSrc('%s://abc123');",
841 chrome::kGuestScheme)); 844 chrome::kGuestScheme));
842 EXPECT_TRUE(delegate->load_aborted()); 845 EXPECT_TRUE(delegate->load_aborted());
843 EXPECT_TRUE(delegate->load_aborted_url().is_valid()); 846 EXPECT_TRUE(delegate->load_aborted_url().is_valid());
844 } 847 }
845 848
846 } // namespace content 849 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/gpu/gpu_feature_browsertest.cc ('k') | content/browser/gpu/compositor_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698