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

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

Issue 2332683002: Disable PolicyTest.DisableScreenshotsFile test due to being flaky. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2552 matching lines...) Expand 10 before | Expand all | Expand 10 after
2563 2563
2564 // Verify that the window cannot be toggled into fullscreen mode from within 2564 // Verify that the window cannot be toggled into fullscreen mode from within
2565 // Chrome (e.g., using keyboard accelerators). 2565 // Chrome (e.g., using keyboard accelerators).
2566 window->Fullscreen(); 2566 window->Fullscreen();
2567 EXPECT_FALSE(window->GetBaseWindow()->IsFullscreen()); 2567 EXPECT_FALSE(window->GetBaseWindow()->IsFullscreen());
2568 } 2568 }
2569 #endif 2569 #endif
2570 2570
2571 #if defined(OS_CHROMEOS) 2571 #if defined(OS_CHROMEOS)
2572 2572
2573 // Flaky http://crbug.com/476964 2573 // Flaky on MSan (crbug.com/476964) and regular Chrome OS (crbug.com/645769).
2574 #if defined(MEMORY_SANITIZER) 2574 IN_PROC_BROWSER_TEST_F(PolicyTest, DISABLED_DisableScreenshotsFile) {
2575 #define MAYBE_DisableScreenshotsFile DISABLED_DisableScreenshotsFile
2576 #else
2577 #define MAYBE_DisableScreenshotsFile DisableScreenshotsFile
2578 #endif
2579
2580 IN_PROC_BROWSER_TEST_F(PolicyTest, MAYBE_DisableScreenshotsFile) {
2581 int screenshot_count = CountScreenshots(); 2575 int screenshot_count = CountScreenshots();
2582 2576
2583 // Make sure screenshots are counted correctly. 2577 // Make sure screenshots are counted correctly.
2584 TestScreenshotFile(true); 2578 TestScreenshotFile(true);
2585 ASSERT_EQ(CountScreenshots(), screenshot_count + 1); 2579 ASSERT_EQ(CountScreenshots(), screenshot_count + 1);
2586 2580
2587 // Check if trying to take a screenshot fails when disabled by policy. 2581 // Check if trying to take a screenshot fails when disabled by policy.
2588 TestScreenshotFile(false); 2582 TestScreenshotFile(false);
2589 ASSERT_EQ(CountScreenshots(), screenshot_count + 1); 2583 ASSERT_EQ(CountScreenshots(), screenshot_count + 1);
2590 } 2584 }
(...skipping 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after
4386 4380
4387 SetEmptyPolicy(); 4381 SetEmptyPolicy();
4388 // Policy not set. 4382 // Policy not set.
4389 CheckSystemTimezoneAutomaticDetectionPolicyUnset(); 4383 CheckSystemTimezoneAutomaticDetectionPolicyUnset();
4390 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false)); 4384 EXPECT_TRUE(CheckResolveTimezoneByGeolocation(true, false));
4391 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests()); 4385 EXPECT_TRUE(manager->TimeZoneResolverShouldBeRunningForTests());
4392 } 4386 }
4393 #endif // defined(OS_CHROMEOS) 4387 #endif // defined(OS_CHROMEOS)
4394 4388
4395 } // namespace policy 4389 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698