commit 40871382b071cef2d3ec5f3884b5722eab3596d8
author Marek Haranczyk <mharanczyk@opera.com> Wed Oct 03 17:35:51 2018
committer Commit Bot <commit-bot@chromium.org> Wed Oct 03 17:35:51 2018
tree e9f5217d32f6788512819ca92f7230877f7e0fff
parent ef5063ca49f180e80fd154b761fc72deb41da4a9

Override manifest handler registry in ManifestHandlerPerfTest.

MANUAL_CommonMeasureFinalization and MANUAL_CommonInitialize tests
reseted global registry on exit without initializing it again causing
random test flakes on tests that operated on manifests that happen to
run after those two tests (they passed on retry).

Change-Id: I2b4297d33441c72d9cdd099106abad68921c2f6a
Reviewed-on: https://chromium-review.googlesource.com/1259046
Commit-Queue: Marek Haranczyk <mharanczyk@opera.com>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596271}

extensions/common/manifest_handler_perf_test.cc

diff --git a/extensions/common/manifest_handler_perf_test.cc b/extensions/common/manifest_handler_perf_test.cc
index 6500e26..f67a521 100644
--- a/extensions/common/manifest_handler_perf_test.cc
+++ b/extensions/common/manifest_handler_perf_test.cc
@@ -4,6 +4,7 @@
 
 #include "extensions/common/common_manifest_handlers.h"
 #include "extensions/common/manifest_handler.h"
+#include "extensions/common/scoped_testing_manifest_handler_registry.h"
 #include "extensions/test/logging_timer.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ -19,7 +20,7 @@
 // and should be run after any substantial changes to the related
 // code.
 TEST(ManifestHandlerPerfTest, MANUAL_CommonInitialize) {
-  ManifestHandlerRegistry::ResetForTesting();
+  ScopedTestingManifestHandlerRegistry scoped_registry;
   static constexpr char kTimerId[] = "CommonInitialize";
   for (int i = 0; i < 100000; ++i) {
     {
@@ -33,7 +34,7 @@
 }
 
 TEST(ManifestHandlerPerfTest, MANUAL_LookupTest) {
-  ManifestHandlerRegistry::ResetForTesting();
+  ScopedTestingManifestHandlerRegistry scoped_registry;
   RegisterCommonManifestHandlers();
   ManifestHandler::FinalizeRegistration();
   ManifestHandlerRegistry* registry = ManifestHandlerRegistry::Get();
@@ -54,7 +55,7 @@
 }
 
 TEST(ManifestHandlerPerfTest, MANUAL_CommonMeasureFinalization) {
-  ManifestHandlerRegistry::ResetForTesting();
+  ScopedTestingManifestHandlerRegistry scoped_registry;
   static constexpr char kTimerId[] = "Finalize";
   for (int i = 0; i < 100000; ++i) {
     {