[Extensions] Kill off ExtensionMsg_AddMessageToConsole

extensions/browser/api/alarms/alarms_api_unittest.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.
 
 // This file tests the chrome.alarms extension API.
 
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
@@ skipping 270 matching lines @@
   CreateAlarm("[\"dup\", {\"delayInMinutes\": 1}]");
   CreateAlarm("[\"dup\", {\"delayInMinutes\": 7}]");
 
   alarm_manager_->GetAllAlarms(
       extension()->id(),
       base::Bind(ExtensionAlarmsTestCreateDupeGetAllAlarmsCallback));
 }
 
 TEST_F(ExtensionAlarmsTest, CreateDelayBelowMinimum) {
   // Create an alarm with delay below the minimum accepted value.
-  CreateAlarm("[\"negative\", {\"delayInMinutes\": -0.2}]");
   IPC::TestSink& sink =
       static_cast<content::MockRenderProcessHost*>(
           contents()->GetRenderViewHost()->GetProcess())->sink();
+  size_t initial_message_count = sink.message_count();
+  CreateAlarm("[\"negative\", {\"delayInMinutes\": -0.2}]");
+  // A new message should have been added.
+  ASSERT_GT(sink.message_count(), initial_message_count);
+
+  // All of this would be cleaner if we could read the message as a
+  // FrameMsg_AddMessageToConsole, but that would be a layering violation.
+  // Better yet would be an observer method for frames adding console messages,
+  // but it's not worth adding just for a test.
   const IPC::Message* warning =
-      sink.GetUniqueMessageMatching(ExtensionMsg_AddMessageToConsole::ID);
+      sink.GetMessageAt(initial_message_count /* 0-based */);
   ASSERT_TRUE(warning);
-  ExtensionMsg_AddMessageToConsole::Param params;
-  ExtensionMsg_AddMessageToConsole::Read(warning, &params);
-  content::ConsoleMessageLevel level = base::get<0>(params);
-  std::string message = base::get<1>(params);
-  EXPECT_EQ(content::CONSOLE_MESSAGE_LEVEL_WARNING, level);
+
+  int level = 0;
+  base::PickleIterator iter(*warning);
+  ASSERT_TRUE(iter.ReadInt(&level));
+  std::string message;
+  ASSERT_TRUE(iter.ReadString(&message));
+
+  EXPECT_EQ(content::CONSOLE_MESSAGE_LEVEL_WARNING,
+            static_cast<content::ConsoleMessageLevel>(level));
   EXPECT_THAT(message, testing::HasSubstr("delay is less than minimum of 1"));
 }
 
 TEST_F(ExtensionAlarmsTest, Get) {
   test_clock_->SetNow(base::Time::FromDoubleT(4));
 
   // Create 2 alarms, and make sure we can query them.
   CreateAlarms(2);
 
   // Get the default one.
@@ skipping 364 matching lines @@
 
   // The next poll should be the first poll that hasn't happened and is in-line
   // with the original scheduling.
   // Last poll was at 380 seconds; next poll should be at 480 seconds.
   EXPECT_DOUBLE_EQ((alarm_manager_->last_poll_time_ +
                     base::TimeDelta::FromSeconds(100)).ToJsTime(),
                    alarm_manager_->next_poll_time_.ToJsTime());
 }
 
 }  // namespace extensions