Index: chrome/browser/chromeos/extensions/info_private_apitest.cc |
diff --git a/chrome/browser/chromeos/extensions/info_private_apitest.cc b/chrome/browser/chromeos/extensions/info_private_apitest.cc |
index 7f7e35e84a91472abb44410d53deed7f3ae829dc..ce8cee265a919cfce81163553766ceacb56a1458 100644 |
--- a/chrome/browser/chromeos/extensions/info_private_apitest.cc |
+++ b/chrome/browser/chromeos/extensions/info_private_apitest.cc |
@@ -3,6 +3,7 @@ |
// found in the LICENSE file. |
#include "base/values.h" |
+#include "chrome/browser/chromeos/arc/arc_session_manager.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
#include "chrome/common/chrome_switches.h" |
@@ -31,11 +32,8 @@ class ChromeOSInfoPrivateTest : public ExtensionApiTest { |
} |
void MakeArcAvailable() { |
- base::CommandLine::ForCurrentProcess()->AppendSwitch( |
- chromeos::switches::kArcAvailable); |
- } |
- |
- void EnableArc() { |
+ // TODO(hidehiko): Introduce a utility to let IsArcAvailable() return true |
hidehiko
2017/01/24 10:57:36
Note: As many other tests do something similar to
|
+ // for testing. |
base::CommandLine::ForCurrentProcess()->AppendSwitch( |
chromeos::switches::kEnableArc); |
} |
@@ -85,14 +83,8 @@ IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, Kiosk) { |
IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcAvailable) { |
Luis Héctor Chávez
2017/01/24 17:00:37
This name is confusing. Can you change it to ArcAv
hidehiko
2017/01/24 18:05:56
Done.
|
MakeArcAvailable(); |
+ arc::ArcSessionManager::DisallowForTesting(); |
ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", |
"arc available")) |
<< message_; |
} |
- |
-IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcEnabled) { |
- EnableArc(); |
- ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", |
- "arc enabled")) |
xiyuan
2017/01/24 17:52:38
Is this test case no longer needed? If so, also up
hidehiko
2017/01/24 18:05:56
Good catch. Done.
|
- << message_; |
-} |