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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 2557513004: Remove explicit singletonness of ArcBridgeService part 3. (Closed)
Patch Set: Address comments. Created 4 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 3990 matching lines...) Expand 10 before | Expand all | Expand 10 after
4001 4001
4002 DISALLOW_COPY_AND_ASSIGN(ArcPolicyTest); 4002 DISALLOW_COPY_AND_ASSIGN(ArcPolicyTest);
4003 }; 4003 };
4004 4004
4005 // Test ArcEnabled policy. 4005 // Test ArcEnabled policy.
4006 IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcEnabled) { 4006 IN_PROC_BROWSER_TEST_F(ArcPolicyTest, ArcEnabled) {
4007 SetUpTest(); 4007 SetUpTest();
4008 4008
4009 const PrefService* const pref = browser()->profile()->GetPrefs(); 4009 const PrefService* const pref = browser()->profile()->GetPrefs();
4010 const arc::ArcBridgeService* const arc_bridge_service = 4010 const arc::ArcBridgeService* const arc_bridge_service =
4011 arc::ArcBridgeService::Get(); 4011 arc::ArcServiceManager::Get()->arc_bridge_service();
4012 4012
4013 // ARC is switched off by default. 4013 // ARC is switched off by default.
4014 EXPECT_TRUE(arc_bridge_service->stopped()); 4014 EXPECT_TRUE(arc_bridge_service->stopped());
4015 EXPECT_FALSE(pref->GetBoolean(prefs::kArcEnabled)); 4015 EXPECT_FALSE(pref->GetBoolean(prefs::kArcEnabled));
4016 4016
4017 // Enable ARC. 4017 // Enable ARC.
4018 SetArcEnabledByPolicy(true); 4018 SetArcEnabledByPolicy(true);
4019 EXPECT_TRUE(arc_bridge_service->ready()); 4019 EXPECT_TRUE(arc_bridge_service->ready());
4020 4020
4021 // Disable ARC. 4021 // Disable ARC.
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
4228 4228
4229 SetEmptyPolicy(); 4229 SetEmptyPolicy();
4230 // Policy not set. 4230 // Policy not set.
4231 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); 4231 CheckSystemTimezoneAutomaticDetectionPolicyUnset();
4232 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); 4232 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
4233 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); 4233 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
4234 } 4234 }
4235 #endif // defined(OS_CHROMEOS) 4235 #endif // defined(OS_CHROMEOS)
4236 4236
4237 } // namespace policy 4237 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/memory/tab_manager_delegate_chromeos.cc ('k') | chrome/browser/speech/tts_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698