| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/test/chrome/athena_browsertest.h" | 5 #include "athena/test/chrome/athena_browsertest.h" |
| 6 | 6 |
| 7 #include "athena/test/chrome/test_util.h" | 7 #include "athena/test/chrome/test_util.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "content/public/common/content_switches.h" |
| 9 | 10 |
| 10 namespace athena { | 11 namespace athena { |
| 11 | 12 |
| 12 namespace { | |
| 13 const char kNoNaclSandbox[] = "--no-sandbox"; | |
| 14 } | |
| 15 | |
| 16 AthenaBrowserTest::AthenaBrowserTest() { | 13 AthenaBrowserTest::AthenaBrowserTest() { |
| 17 } | 14 } |
| 18 | 15 |
| 19 AthenaBrowserTest::~AthenaBrowserTest() { | 16 AthenaBrowserTest::~AthenaBrowserTest() { |
| 20 } | 17 } |
| 21 | 18 |
| 22 void AthenaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { | 19 void AthenaBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { |
| 23 // The NaCl sandbox won't work in our browser tests. | 20 // The NaCl sandbox won't work in our browser tests. |
| 24 command_line->AppendSwitch(kNoNaclSandbox); | 21 command_line->AppendSwitch(switches::kNoSandbox); |
| 25 InProcessBrowserTest::SetUpCommandLine(command_line); | 22 InProcessBrowserTest::SetUpCommandLine(command_line); |
| 26 } | 23 } |
| 27 | 24 |
| 28 void AthenaBrowserTest::SetUpOnMainThread() { | 25 void AthenaBrowserTest::SetUpOnMainThread() { |
| 29 // Set the memory pressure to low and turning off undeterministic resource | 26 // Set the memory pressure to low and turning off undeterministic resource |
| 30 // observer events. | 27 // observer events. |
| 31 test_util::SendTestMemoryPressureEvent(ResourceManager::MEMORY_PRESSURE_LOW); | 28 test_util::SendTestMemoryPressureEvent(ResourceManager::MEMORY_PRESSURE_LOW); |
| 32 } | 29 } |
| 33 | 30 |
| 34 } // namespace athena | 31 } // namespace athena |
| OLD | NEW |