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

Side by Side Diff: chrome/browser/apps/guest_view/extension_view/extension_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 "chrome/test/base/ui_test_utils.h" 7 #include "chrome/test/base/ui_test_utils.h"
8 #include "content/public/test/browser_test_utils.h" 8 #include "content/public/test/browser_test_utils.h"
9 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h "
9 #include "extensions/browser/guest_view/guest_view_manager.h" 10 #include "extensions/browser/guest_view/guest_view_manager.h"
10 #include "extensions/browser/guest_view/guest_view_manager_factory.h" 11 #include "extensions/browser/guest_view/guest_view_manager_factory.h"
11 #include "extensions/test/extension_test_message_listener.h" 12 #include "extensions/test/extension_test_message_listener.h"
12 13
13 namespace { 14 namespace {
14 15
15 class TestGuestViewManager : public extensions::GuestViewManager { 16 class TestGuestViewManager : public extensions::GuestViewManager {
16 public: 17 public:
17 explicit TestGuestViewManager(content::BrowserContext* context) 18 TestGuestViewManager(content::BrowserContext* context,
18 : extensions::GuestViewManager(context), web_contents_(NULL) {} 19 scoped_ptr<guestview::GuestViewManagerDelegate> delegate)
20 : extensions::GuestViewManager(context, delegate.Pass()),
21 web_contents_(NULL) {}
19 22
20 content::WebContents* WaitForGuestCreated() { 23 content::WebContents* WaitForGuestCreated() {
21 if (web_contents_) 24 if (web_contents_)
22 return web_contents_; 25 return web_contents_;
23 26
24 message_loop_runner_ = new content::MessageLoopRunner; 27 message_loop_runner_ = new content::MessageLoopRunner;
25 message_loop_runner_->Run(); 28 message_loop_runner_->Run();
26 return web_contents_; 29 return web_contents_;
27 } 30 }
28 31
(...skipping 20 matching lines...) Expand all
49 52
50 ~TestGuestViewManagerFactory() override {} 53 ~TestGuestViewManagerFactory() override {}
51 54
52 extensions::GuestViewManager* CreateGuestViewManager( 55 extensions::GuestViewManager* CreateGuestViewManager(
53 content::BrowserContext* context) override { 56 content::BrowserContext* context) override {
54 return GetManager(context); 57 return GetManager(context);
55 } 58 }
56 59
57 TestGuestViewManager* GetManager(content::BrowserContext* context) { 60 TestGuestViewManager* GetManager(content::BrowserContext* context) {
58 if (!test_guest_view_manager_) { 61 if (!test_guest_view_manager_) {
59 test_guest_view_manager_ = new TestGuestViewManager(context); 62 test_guest_view_manager_ = new TestGuestViewManager(
63 context,
64 scoped_ptr<guestview::GuestViewManagerDelegate>(
65 new extensions::ExtensionsGuestViewManagerDelegate(context)));
60 } 66 }
61 return test_guest_view_manager_; 67 return test_guest_view_manager_;
62 } 68 }
63 69
64 private: 70 private:
65 TestGuestViewManager* test_guest_view_manager_; 71 TestGuestViewManager* test_guest_view_manager_;
66 72
67 DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory); 73 DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory);
68 }; 74 };
69 75
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ConnectAPICall) { 139 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ConnectAPICall) {
134 ASSERT_TRUE(RunPlatformAppTest("platform_apps/extension_view/connect_api")); 140 ASSERT_TRUE(RunPlatformAppTest("platform_apps/extension_view/connect_api"));
135 } 141 }
136 142
137 // Tests that verify that <extensionview> does not change extension ID if 143 // Tests that verify that <extensionview> does not change extension ID if
138 // someone tries to change it in JavaScript. 144 // someone tries to change it in JavaScript.
139 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ShimExtensionAttribute) { 145 IN_PROC_BROWSER_TEST_F(ExtensionViewTest, ShimExtensionAttribute) {
140 ASSERT_TRUE(RunPlatformAppTest( 146 ASSERT_TRUE(RunPlatformAppTest(
141 "platform_apps/extension_view/extension_attribute")); 147 "platform_apps/extension_view/extension_attribute"));
142 } 148 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698