projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
gpu
/
gpu_ipc_browsertests.cc
diff --git
a/src/content/browser/gpu/gpu_ipc_browsertests.cc
b/src/content/browser/gpu/gpu_ipc_browsertests.cc
index
eb3c6ce
..
dd78ba6
100644
(file)
--- a/
src/content/browser/gpu/gpu_ipc_browsertests.cc
+++ b/
src/content/browser/gpu/gpu_ipc_browsertests.cc
@@
-25,7
+25,7
@@
const content::CauseForGpuLaunch kInitCause =
class ContextTestBase : public content::ContentBrowserTest {
public:
class ContextTestBase : public content::ContentBrowserTest {
public:
- v
irtual void SetUpOnMainThread() OVERRIDE
{
+ v
oid SetUpOnMainThread() override
{
if (!content::BrowserGpuChannelHostFactory::CanUseForTesting())
return;
if (!content::BrowserGpuChannelHostFactory::CanUseForTesting())
return;
@@
-52,7
+52,7
@@
class ContextTestBase : public content::ContentBrowserTest {
ContentBrowserTest::SetUpOnMainThread();
}
ContentBrowserTest::SetUpOnMainThread();
}
- v
irtual void TearDownOnMainThread() OVERRIDE
{
+ v
oid TearDownOnMainThread() override
{
// Must delete the context first.
context_.reset(NULL);
ContentBrowserTest::TearDownOnMainThread();
// Must delete the context first.
context_.reset(NULL);
ContentBrowserTest::TearDownOnMainThread();
@@
-73,7
+73,7
@@
namespace content {
class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest {
public:
class BrowserGpuChannelHostFactoryTest : public ContentBrowserTest {
public:
- v
irtual void SetUpOnMainThread() OVERRIDE
{
+ v
oid SetUpOnMainThread() override
{
if (!BrowserGpuChannelHostFactory::CanUseForTesting())
return;
if (!BrowserGpuChannelHostFactory::CanUseForTesting())
return;