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

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

Issue 1973603002: arc: Make Play Store item persistance in shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update browser test (adding required switch_) Created 4 years, 7 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) 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 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 protected: 663 protected:
664 PolicyTest() {} 664 PolicyTest() {}
665 ~PolicyTest() override {} 665 ~PolicyTest() override {}
666 666
667 void SetUp() override { 667 void SetUp() override {
668 test_extension_cache_.reset(new extensions::ExtensionCacheFake()); 668 test_extension_cache_.reset(new extensions::ExtensionCacheFake());
669 InProcessBrowserTest::SetUp(); 669 InProcessBrowserTest::SetUp();
670 } 670 }
671 671
672 void SetUpInProcessBrowserTestFixture() override { 672 void SetUpInProcessBrowserTestFixture() override {
673 base::CommandLine::ForCurrentProcess()->AppendSwitch("noerrdialogs"); 673 base::CommandLine* const command_line =
674 base::CommandLine::ForCurrentProcess();
675 command_line->AppendSwitch("noerrdialogs");
676 command_line->AppendSwitch(chromeos::switches::kEnableArc);
pastarmovj 2016/05/17 22:13:05 please document the behavior and the reason why th
khmel 2016/05/17 22:48:35 Done, and moved it to Arc test, where it looks mor
674 EXPECT_CALL(provider_, IsInitializationComplete(_)) 677 EXPECT_CALL(provider_, IsInitializationComplete(_))
675 .WillRepeatedly(Return(true)); 678 .WillRepeatedly(Return(true));
676 BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); 679 BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
677 } 680 }
678 681
679 void SetUpOnMainThread() override { 682 void SetUpOnMainThread() override {
680 BrowserThread::PostTask( 683 BrowserThread::PostTask(
681 BrowserThread::IO, FROM_HERE, 684 BrowserThread::IO, FROM_HERE,
682 base::Bind(chrome_browser_net::SetUrlRequestMocksEnabled, true)); 685 base::Bind(chrome_browser_net::SetUrlRequestMocksEnabled, true));
683 if (extension_service()->updater()) { 686 if (extension_service()->updater()) {
(...skipping 3343 matching lines...) Expand 10 before | Expand all | Expand 10 after
4027 4030
4028 SetEmptyPolicy(); 4031 SetEmptyPolicy();
4029 // Policy not set. 4032 // Policy not set.
4030 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); 4033 CheckSystemTimezoneAutomaticDetectionPolicyUnset();
4031 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); 4034 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
4032 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); 4035 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
4033 } 4036 }
4034 #endif // defined(OS_CHROMEOS) 4037 #endif // defined(OS_CHROMEOS)
4035 4038
4036 } // namespace policy 4039 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_support_host.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698