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

Unified Diff: extensions/browser/guest_view/test_guest_view_manager.h

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter
Patch Set: Fixed more tests Created 5 years, 8 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: extensions/browser/guest_view/test_guest_view_manager.h
diff --git a/extensions/browser/guest_view/test_guest_view_manager.h b/extensions/browser/guest_view/test_guest_view_manager.h
index b826f30ff5af9a075c7fc6ec7f334810735b5988..33695c9f2e6e05cc55416368f9d9ea68920ec37f 100644
--- a/extensions/browser/guest_view/test_guest_view_manager.h
+++ b/extensions/browser/guest_view/test_guest_view_manager.h
@@ -15,7 +15,9 @@ namespace extensions {
class TestGuestViewManager : public GuestViewManager {
public:
- explicit TestGuestViewManager(content::BrowserContext* context);
+ TestGuestViewManager(
+ content::BrowserContext* context,
+ scoped_ptr<guestview::GuestViewManagerDelegate> delegate);
~TestGuestViewManager() override;
void WaitForAllGuestsDeleted();
@@ -23,15 +25,24 @@ class TestGuestViewManager : public GuestViewManager {
content::WebContents* GetLastGuestCreated();
+ // Returns the number of guests currently still alive at the time of calling
+ // this method.
+ int GetNumGuestsActive() const;
+
+ // Reutnrs the number of guests that have been created since the creation of
+ // this GuestViewManager.
+ int num_guests_created() const { return num_guests_created_; }
+
private:
// GuestViewManager override:
void AddGuest(int guest_instance_id,
content::WebContents* guest_web_contents) override;
void RemoveGuest(int guest_instance_id) override;
- int GetNumGuests() const;
void WaitForGuestCreated();
+ int num_guests_created_;
+
std::vector<linked_ptr<content::WebContentsDestroyedWatcher>>
guest_web_contents_watchers_;
scoped_refptr<content::MessageLoopRunner> created_message_loop_runner_;
@@ -46,9 +57,8 @@ class TestGuestViewManagerFactory : public GuestViewManagerFactory {
~TestGuestViewManagerFactory() override;
GuestViewManager* CreateGuestViewManager(
- content::BrowserContext* context) override;
-
- TestGuestViewManager* GetManager(content::BrowserContext* context);
+ content::BrowserContext* context,
+ scoped_ptr<guestview::GuestViewManagerDelegate> delegate) override;
private:
TestGuestViewManager* test_guest_view_manager_;

Powered by Google App Engine
This is Rietveld 408576698