| Index: chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| index 0e019c935b099b00359b0daccabdb2f02aa572db..3e18263f44cb0d9f95f09dd8e1d68f98151619e5 100644
|
| --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
|
| @@ -28,11 +28,10 @@ namespace {
|
| static bool had_console_errors = false;
|
|
|
| bool HandleMessage(int severity,
|
| - const char* file,
|
| + const std::string& file,
|
| int line,
|
| - size_t message_start,
|
| const std::string& str) {
|
| - if (severity == logging::LOG_ERROR && file && file == std::string("CONSOLE"))
|
| + if (severity == logging::LOG_ERROR && file == std::string("CONSOLE"))
|
| had_console_errors = true;
|
| return false;
|
| }
|
| @@ -42,10 +41,12 @@ bool HandleMessage(int severity,
|
| class NewTabUIBrowserTest : public InProcessBrowserTest {
|
| public:
|
| NewTabUIBrowserTest() {
|
| - logging::SetLogMessageHandler(&HandleMessage);
|
| + logging::AddLogMessageHandler(&HandleMessage);
|
| }
|
|
|
| - ~NewTabUIBrowserTest() override { logging::SetLogMessageHandler(NULL); }
|
| + ~NewTabUIBrowserTest() override {
|
| + logging::RemoveLogMessageHandler(&HandleMessage);
|
| + }
|
|
|
| void TearDown() override {
|
| InProcessBrowserTest::TearDown();
|
|
|