Revert of Revert "Revert of Reland: Switch WindowedNotificationObserver to use base::RunLoop....

chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.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 "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 86 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Class to handle messages from the renderer needed by certain tests.
 class NetInternalsTest::MessageHandler : public content::WebUIMessageHandler {
  public:
   explicit MessageHandler(NetInternalsTest* net_internals_test);
 
  private:
   void RegisterMessages() override;
 
-  void RegisterMessage(const std::string& message,
-                       const content::WebUI::MessageCallback& handler);
-
-  void HandleMessage(const content::WebUI::MessageCallback& handler,
-                     const base::ListValue* data);
-
   // Runs NetInternalsTest.callback with the given value.
   void RunJavascriptCallback(base::Value* value);
 
   // Takes a string and provides the corresponding URL from the test server,
   // which must already have been started.
   void GetTestServerURL(const base::ListValue* list_value);
 
   // Called on UI thread.  Adds an entry to the cache for the specified
   // hostname by posting a task to the IO thread.  Takes the host name,
   // ip address, net error code, and expiration time in days from now
@@ skipping 38 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MessageHandler);
 };
 
 NetInternalsTest::MessageHandler::MessageHandler(
     NetInternalsTest* net_internals_test)
     : net_internals_test_(net_internals_test),
       incognito_browser_(NULL) {
 }
 
 void NetInternalsTest::MessageHandler::RegisterMessages() {
-  RegisterMessage(
-      "getTestServerURL",
+  web_ui()->RegisterMessageCallback("getTestServerURL",
       base::Bind(&NetInternalsTest::MessageHandler::GetTestServerURL,
                  base::Unretained(this)));
-  RegisterMessage("addCacheEntry",
-                  base::Bind(&NetInternalsTest::MessageHandler::AddCacheEntry,
-                             base::Unretained(this)));
-  RegisterMessage("changeNetwork",
-                  base::Bind(&NetInternalsTest::MessageHandler::ChangeNetwork,
-                             base::Unretained(this)));
-  RegisterMessage("loadPage",
-                  base::Bind(&NetInternalsTest::MessageHandler::LoadPage,
-                             base::Unretained(this)));
-  RegisterMessage("prerenderPage",
-                  base::Bind(&NetInternalsTest::MessageHandler::PrerenderPage,
-                             base::Unretained(this)));
-  RegisterMessage(
-      "navigateToPrerender",
+  web_ui()->RegisterMessageCallback("addCacheEntry",
+      base::Bind(&NetInternalsTest::MessageHandler::AddCacheEntry,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "changeNetwork",
+      base::Bind(&NetInternalsTest::MessageHandler::ChangeNetwork,
+                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("loadPage",
+      base::Bind(&NetInternalsTest::MessageHandler::LoadPage,
+                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("prerenderPage",
+      base::Bind(&NetInternalsTest::MessageHandler::PrerenderPage,
+                  base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("navigateToPrerender",
       base::Bind(&NetInternalsTest::MessageHandler::NavigateToPrerender,
                  base::Unretained(this)));
-  RegisterMessage(
-      "createIncognitoBrowser",
+  web_ui()->RegisterMessageCallback("createIncognitoBrowser",
       base::Bind(&NetInternalsTest::MessageHandler::CreateIncognitoBrowser,
                  base::Unretained(this)));
-  RegisterMessage(
-      "closeIncognitoBrowser",
+  web_ui()->RegisterMessageCallback("closeIncognitoBrowser",
       base::Bind(&NetInternalsTest::MessageHandler::CloseIncognitoBrowser,
                  base::Unretained(this)));
-  RegisterMessage(
-      "getNetLogFileContents",
-      base::Bind(&NetInternalsTest::MessageHandler::GetNetLogFileContents,
-                 base::Unretained(this)));
-  RegisterMessage(
-      "enableDataReductionProxy",
-      base::Bind(&NetInternalsTest::MessageHandler::EnableDataReductionProxy,
-                 base::Unretained(this)));
-}
-
-void NetInternalsTest::MessageHandler::RegisterMessage(
-    const std::string& message,
-    const content::WebUI::MessageCallback& handler) {
-  web_ui()->RegisterMessageCallback(
-      message, base::Bind(&NetInternalsTest::MessageHandler::HandleMessage,
-                          base::Unretained(this), handler));
-}
-
-void NetInternalsTest::MessageHandler::HandleMessage(
-    const content::WebUI::MessageCallback& handler,
-    const base::ListValue* data) {
-  // The handler might run a nested loop to wait for something.
-  base::MessageLoop::ScopedNestableTaskAllower nestable_task_allower(
-      base::MessageLoop::current());
-  handler.Run(data);
+  web_ui()->RegisterMessageCallback("getNetLogFileContents",
+      base::Bind(
+          &NetInternalsTest::MessageHandler::GetNetLogFileContents,
+          base::Unretained(this)));
+  web_ui()->RegisterMessageCallback("enableDataReductionProxy",
+      base::Bind(
+          &NetInternalsTest::MessageHandler::EnableDataReductionProxy,
+          base::Unretained(this)));
 }
 
 void NetInternalsTest::MessageHandler::RunJavascriptCallback(
     base::Value* value) {
   web_ui()->CallJavascriptFunctionUnsafe("NetInternalsTest.callback", *value);
 }
 
 void NetInternalsTest::MessageHandler::GetTestServerURL(
     const base::ListValue* list_value) {
   ASSERT_TRUE(net_internals_test_->StartTestServer());
@@ skipping 168 matching lines @@
   if (test_server_started_)
     return true;
   test_server_started_ = embedded_test_server()->Start();
 
   // Sample domain for SDCH-view test. Dictionaries for localhost/127.0.0.1
   // are forbidden.
   host_resolver()->AddRule("testdomain.com", "127.0.0.1");
   host_resolver()->AddRule("sub.testdomain.com", "127.0.0.1");
   return test_server_started_;
 }