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

Unified Diff: content/browser/browser_plugin/test_browser_plugin_guest.h

Issue 11028019: Browser plugin: Implement loadRedirect event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_plugin/test_browser_plugin_guest.h
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest.h b/content/browser/browser_plugin/test_browser_plugin_guest.h
index fa1a49144e644cd122459394d8f08b73a22ba590..fbc7a4f95d95feb7c1504b0c576b1894db4e2286 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest.h
+++ b/content/browser/browser_plugin/test_browser_plugin_guest.h
@@ -8,7 +8,6 @@
#include "base/compiler_specific.h"
#include "base/process_util.h"
#include "content/browser/browser_plugin/browser_plugin_guest.h"
-#include "content/public/browser/notification_observer.h"
#include "content/public/test/test_utils.h"
#include "ui/gfx/size.h"
@@ -23,8 +22,7 @@ class RenderViewHost;
//
// Provides utilities to wait for certain state/messages in BrowserPluginGuest
// to be used in tests.
-class TestBrowserPluginGuest : public BrowserPluginGuest,
- public NotificationObserver {
+class TestBrowserPluginGuest : public BrowserPluginGuest {
public:
TestBrowserPluginGuest(int instance_id,
WebContentsImpl* web_contents,
@@ -99,9 +97,6 @@ class TestBrowserPluginGuest : public BrowserPluginGuest,
scoped_refptr<MessageLoopRunner> stop_message_loop_runner_;
scoped_refptr<MessageLoopRunner> damage_buffer_message_loop_runner_;
- // A scoped container for notification registries.
- NotificationRegistrar registrar_;
-
DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuest);
};

Powered by Google App Engine
This is Rietveld 408576698