Revert of Change the battery-status layout tests to use JS mocks.

content/shell/renderer/layout_test/blink_test_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <clocale>
 #include <cmath>
@@ skipping 16 matching lines @@
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
 #include "components/test_runner/gamepad_controller.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "components/test_runner/web_test_runner.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/service_registry.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/media_stream_utils.h"
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "content/public/renderer/renderer_gamepad_provider.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/layout_test/layout_test_messages.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"
 #include "content/shell/renderer/layout_test/leak_detector.h"
@@ skipping 537 matching lines @@
       local_frame = RenderFrame::FromWebFrame(frame);
       break;
     }
   }
   DCHECK(local_frame);
   Send(new ShellViewHostMsg_LayoutTestRuntimeFlagsChanged(
       local_frame->GetRoutingID(), changed_values));
 }
 
 void BlinkTestRunner::TestFinished() {
-  // In layout tests, mock Mojo service factories implemented in JS may be
-  // installed on the per-frame and the per-process service registries. With
-  // the test finished, clear any overrides so they don't interfere with any
-  // later tests and so they aren't detected as leaks.
-  RenderThread::Get()->GetServiceRegistry()->ClearServiceOverridesForTesting();
-  render_view()
-      ->GetMainRenderFrame()
-      ->GetServiceRegistry()
-      ->ClearServiceOverridesForTesting();
-
   if (!is_main_window_ || !render_view()->GetMainRenderFrame()) {
     Send(new ShellViewHostMsg_TestFinishedInSecondaryRenderer(routing_id()));
     return;
   }
   test_runner::WebTestInterfaces* interfaces =
       LayoutTestRenderProcessObserver::GetInstance()->test_interfaces();
   interfaces->SetTestIsRunning(false);
   if (interfaces->TestRunner()->ShouldDumpBackForwardList()) {
     SyncNavigationStateVisitor visitor;
     RenderView::ForEach(&visitor);
@@ skipping 401 matching lines @@
   get_bluetooth_events_callbacks_.pop_front();
   callback.Run(events);
 }
 
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content