| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/values.h" | 5 #include "base/values.h" |
| 6 #include "chrome/browser/chromeos/arc/arc_util.h" | 6 #include "chrome/browser/chromeos/arc/arc_session_manager.h" |
| 7 #include "chrome/browser/chromeos/settings/cros_settings.h" | 7 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
| 11 #include "chromeos/settings/cros_settings_names.h" | 11 #include "chromeos/settings/cros_settings_names.h" |
| 12 #include "components/arc/arc_util.h" | 12 #include "components/arc/arc_util.h" |
| 13 #include "components/prefs/pref_service.h" | 13 #include "components/prefs/pref_service.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 IN_PROC_BROWSER_TEST_F(ChromeOSArcInfoPrivateTest, ArcEnabled) { | 98 IN_PROC_BROWSER_TEST_F(ChromeOSArcInfoPrivateTest, ArcEnabled) { |
| 99 ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", | 99 ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", |
| 100 "arc enabled")) | 100 "arc enabled")) |
| 101 << message_; | 101 << message_; |
| 102 } | 102 } |
| 103 | 103 |
| 104 IN_PROC_BROWSER_TEST_F(ChromeOSArcInfoPrivateTest, ArcAvailable) { | 104 IN_PROC_BROWSER_TEST_F(ChromeOSArcInfoPrivateTest, ArcAvailable) { |
| 105 // Even if ARC is available, ARC may not be able to be enabled. (Please | 105 // Even if ARC is available, ARC may not be able to be enabled. (Please |
| 106 // see arc::IsArcAllowedForProfile() for details). | 106 // see ArcSessionManager::IsAllowedForProfile() for details). |
| 107 // In such cases, we expect "available". However, current testing framework | 107 // In such cases, we expect "available". However, current testing framework |
| 108 // does not seem to run with such cases, unfortunately. So, here directly | 108 // does not seem to run with such cases, unfortunately. So, here directly |
| 109 // control the function. | 109 // control the function. |
| 110 arc::DisallowArcForTesting(); | 110 arc::ArcSessionManager::DisallowForTesting(); |
| 111 ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", | 111 ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", |
| 112 "arc available")) | 112 "arc available")) |
| 113 << message_; | 113 << message_; |
| 114 } | 114 } |
| OLD | NEW |