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

Side by Side Diff: chrome/browser/apps/guest_view/app_view_browsertest.cc

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 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "chrome/browser/apps/app_browsertest_util.h" 6 #include "chrome/browser/apps/app_browsertest_util.h"
7 #include "content/public/browser/notification_service.h" 7 #include "content/public/browser/notification_service.h"
8 #include "content/public/browser/render_process_host.h" 8 #include "content/public/browser/render_process_host.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 #include "content/public/test/test_utils.h" 10 #include "content/public/test/test_utils.h"
11 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h "
11 #include "extensions/browser/guest_view/guest_view_manager.h" 12 #include "extensions/browser/guest_view/guest_view_manager.h"
12 #include "extensions/browser/guest_view/guest_view_manager_factory.h" 13 #include "extensions/browser/guest_view/guest_view_manager_factory.h"
13 #include "extensions/common/switches.h" 14 #include "extensions/common/switches.h"
14 #include "extensions/test/extension_test_message_listener.h" 15 #include "extensions/test/extension_test_message_listener.h"
15 #include "net/test/embedded_test_server/embedded_test_server.h" 16 #include "net/test/embedded_test_server/embedded_test_server.h"
16 #include "net/test/embedded_test_server/http_request.h" 17 #include "net/test/embedded_test_server/http_request.h"
17 #include "net/test/embedded_test_server/http_response.h" 18 #include "net/test/embedded_test_server/http_response.h"
18 19
19 namespace { 20 namespace {
20 21
21 class TestGuestViewManager : public extensions::GuestViewManager { 22 class TestGuestViewManager : public extensions::GuestViewManager {
22 public: 23 public:
23 explicit TestGuestViewManager(content::BrowserContext* context) : 24 TestGuestViewManager(
24 extensions::GuestViewManager(context), 25 content::BrowserContext* context,
26 scoped_ptr<guestview::GuestViewManagerDelegate> delegate) :
27 extensions::GuestViewManager(context, delegate.Pass()),
25 web_contents_(NULL) {} 28 web_contents_(NULL) {}
26 29
27 content::WebContents* WaitForGuestCreated() { 30 content::WebContents* WaitForGuestCreated() {
28 if (web_contents_) 31 if (web_contents_)
29 return web_contents_; 32 return web_contents_;
30 33
31 message_loop_runner_ = new content::MessageLoopRunner; 34 message_loop_runner_ = new content::MessageLoopRunner;
32 message_loop_runner_->Run(); 35 message_loop_runner_->Run();
33 return web_contents_; 36 return web_contents_;
34 } 37 }
(...skipping 22 matching lines...) Expand all
57 60
58 ~TestGuestViewManagerFactory() override {} 61 ~TestGuestViewManagerFactory() override {}
59 62
60 extensions::GuestViewManager* CreateGuestViewManager( 63 extensions::GuestViewManager* CreateGuestViewManager(
61 content::BrowserContext* context) override { 64 content::BrowserContext* context) override {
62 return GetManager(context); 65 return GetManager(context);
63 } 66 }
64 67
65 TestGuestViewManager* GetManager(content::BrowserContext* context) { 68 TestGuestViewManager* GetManager(content::BrowserContext* context) {
66 if (!test_guest_view_manager_) { 69 if (!test_guest_view_manager_) {
67 test_guest_view_manager_ = new TestGuestViewManager(context); 70 test_guest_view_manager_ = new TestGuestViewManager(
71 context,
72 scoped_ptr<guestview::GuestViewManagerDelegate>(
73 new extensions::ExtensionsGuestViewManagerDelegate(context)));
68 } 74 }
69 return test_guest_view_manager_; 75 return test_guest_view_manager_;
70 } 76 }
71 77
72 private: 78 private:
73 TestGuestViewManager* test_guest_view_manager_; 79 TestGuestViewManager* test_guest_view_manager_;
74 80
75 DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory); 81 DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory);
76 }; 82 };
77 83
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 175
170 // Tests that <appview> correctly handles multiple successive connects. 176 // Tests that <appview> correctly handles multiple successive connects.
171 IN_PROC_BROWSER_TEST_F(AppViewTest, TestAppViewMultipleConnects) { 177 IN_PROC_BROWSER_TEST_F(AppViewTest, TestAppViewMultipleConnects) {
172 const extensions::Extension* skeleton_app = 178 const extensions::Extension* skeleton_app =
173 InstallPlatformApp("app_view/shim/skeleton"); 179 InstallPlatformApp("app_view/shim/skeleton");
174 TestHelper("testAppViewMultipleConnects", 180 TestHelper("testAppViewMultipleConnects",
175 "app_view/shim", 181 "app_view/shim",
176 skeleton_app->id(), 182 skeleton_app->id(),
177 NO_TEST_SERVER); 183 NO_TEST_SERVER);
178 } 184 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698