Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: chrome/browser/chromeos/extensions/info_private_apitest.cc

Issue 2642783003: Move more utility functions to arc_util. (Closed)
Patch Set: address review comments Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_session_manager.h" 6 #include "chrome/browser/chromeos/arc/arc_util.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/chromeos_switches.h" 11 #include "chromeos/chromeos_switches.h"
12 #include "chromeos/settings/cros_settings_names.h" 12 #include "chromeos/settings/cros_settings_names.h"
13 #include "components/prefs/pref_service.h" 13 #include "components/prefs/pref_service.h"
14 14
15 namespace { 15 namespace {
16 16
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, Kiosk) { 77 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, Kiosk) {
78 EnableKioskSession(); 78 EnableKioskSession();
79 ASSERT_TRUE( 79 ASSERT_TRUE(
80 RunPlatformAppTestWithArg("chromeos_info_private/extended", "kiosk")) 80 RunPlatformAppTestWithArg("chromeos_info_private/extended", "kiosk"))
81 << message_; 81 << message_;
82 } 82 }
83 83
84 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcAvailable) { 84 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, ArcAvailable) {
85 MakeArcAvailable(); 85 MakeArcAvailable();
86 arc::ArcSessionManager::DisallowForTesting(); 86 arc::DisallowArcForTesting();
87 ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended", 87 ASSERT_TRUE(RunPlatformAppTestWithArg("chromeos_info_private/extended",
88 "arc available")) 88 "arc available"))
89 << message_; 89 << message_;
90 } 90 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698