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
/
chrome
/
browser
/
about_flags_unittest.cc
diff --git
a/src/chrome/browser/about_flags_unittest.cc
b/src/chrome/browser/about_flags_unittest.cc
index
a666043
..
32fb1de
100644
(file)
--- a/
src/chrome/browser/about_flags_unittest.cc
+++ b/
src/chrome/browser/about_flags_unittest.cc
@@
-292,7
+292,7
@@
class AboutFlagsTest : public ::testing::Test {
testing::ClearState();
}
testing::ClearState();
}
- v
irtual void SetUp() OVERRIDE
{
+ v
oid SetUp() override
{
for (size_t i = 0; i < arraysize(kExperiments); ++i)
kExperiments[i].supported_platforms = GetCurrentPlatform();
for (size_t i = 0; i < arraysize(kExperiments); ++i)
kExperiments[i].supported_platforms = GetCurrentPlatform();
@@
-304,9
+304,7
@@
class AboutFlagsTest : public ::testing::Test {
testing::SetExperiments(kExperiments, arraysize(kExperiments));
}
testing::SetExperiments(kExperiments, arraysize(kExperiments));
}
- virtual void TearDown() OVERRIDE {
- testing::SetExperiments(NULL, 0);
- }
+ void TearDown() override { testing::SetExperiments(NULL, 0); }
TestingPrefServiceSimple prefs_;
PrefServiceFlagsStorage flags_storage_;
TestingPrefServiceSimple prefs_;
PrefServiceFlagsStorage flags_storage_;