Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

Issue 292443004: Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 5 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 }; 80 };
81 81
82 class InterceptingMessageFilter : public content::BrowserMessageFilter { 82 class InterceptingMessageFilter : public content::BrowserMessageFilter {
83 public: 83 public:
84 InterceptingMessageFilter() 84 InterceptingMessageFilter()
85 : BrowserMessageFilter(SafeBrowsingMsgStart), 85 : BrowserMessageFilter(SafeBrowsingMsgStart),
86 waiting_message_loop_(NULL) { 86 waiting_message_loop_(NULL) {
87 } 87 }
88 88
89 const ClientPhishingRequest* verdict() const { return verdict_.get(); } 89 const ClientPhishingRequest* verdict() const { return verdict_.get(); }
90 virtual bool OnMessageReceived(const IPC::Message& message, 90 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
91 bool* message_was_ok) OVERRIDE {
92 bool handled = true; 91 bool handled = true;
93 IPC_BEGIN_MESSAGE_MAP(InterceptingMessageFilter, message) 92 IPC_BEGIN_MESSAGE_MAP(InterceptingMessageFilter, message)
94 IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_PhishingDetectionDone, 93 IPC_MESSAGE_HANDLER(SafeBrowsingHostMsg_PhishingDetectionDone,
95 OnPhishingDetectionDone) 94 OnPhishingDetectionDone)
96 IPC_MESSAGE_UNHANDLED(handled = false); 95 IPC_MESSAGE_UNHANDLED(handled = false);
97 IPC_END_MESSAGE_MAP() 96 IPC_END_MESSAGE_MAP()
98 return handled; 97 return handled;
99 } 98 }
100 99
101 void Reset() { 100 void Reset() {
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 RunClassificationDone(verdict); 625 RunClassificationDone(verdict);
627 ASSERT_TRUE(intercepting_filter_->verdict()); 626 ASSERT_TRUE(intercepting_filter_->verdict());
628 EXPECT_EQ(verdict.SerializeAsString(), 627 EXPECT_EQ(verdict.SerializeAsString(),
629 intercepting_filter_->verdict()->SerializeAsString()); 628 intercepting_filter_->verdict()->SerializeAsString());
630 629
631 // The delegate will cancel pending classification on destruction. 630 // The delegate will cancel pending classification on destruction.
632 EXPECT_CALL(*classifier_, CancelPendingClassification()); 631 EXPECT_CALL(*classifier_, CancelPendingClassification());
633 } 632 }
634 633
635 } // namespace safe_browsing 634 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_mock_render_thread.cc ('k') | components/cdm/browser/cdm_message_filter_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698