Chromium Code Reviews| Index: extensions/browser/guest_view/guest_view_manager_unittest.cc |
| diff --git a/chrome/browser/guest_view/guest_view_manager_unittest.cc b/extensions/browser/guest_view/guest_view_manager_unittest.cc |
| similarity index 83% |
| rename from chrome/browser/guest_view/guest_view_manager_unittest.cc |
| rename to extensions/browser/guest_view/guest_view_manager_unittest.cc |
| index 05b53d581bbf4a0357a0017837bb4ead0612846c..a65c5251d1b86b010bc4a54833bb5ba363de5d03 100644 |
| --- a/chrome/browser/guest_view/guest_view_manager_unittest.cc |
| +++ b/extensions/browser/guest_view/guest_view_manager_unittest.cc |
| @@ -2,16 +2,19 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "chrome/browser/guest_view/guest_view_manager.h" |
| +#include "extensions/browser/guest_view/guest_view_manager.h" |
| -#include "chrome/test/base/testing_profile.h" |
| +#include "content/public/browser/notification_service.h" |
| +#include "content/public/test/test_browser_context.h" |
| #include "content/public/test/test_browser_thread_bundle.h" |
| #include "content/public/test/web_contents_tester.h" |
| -#include "testing/gtest/include/gtest/gtest.h" |
| +#include "extensions/browser/extensions_test.h" |
| using content::WebContents; |
| using content::WebContentsTester; |
| +namespace extensions { |
| + |
| namespace guestview { |
| // This class allows us to access some private variables in |
| @@ -38,9 +41,10 @@ class TestGuestViewManager : public GuestViewManager { |
| namespace { |
| -class GuestViewManagerTest : public testing::Test { |
| +class GuestViewManagerTest : public extensions::ExtensionsTest { |
| public: |
| - GuestViewManagerTest() {} |
| + GuestViewManagerTest() : |
| + notification_service_(content::NotificationService::Create()) {} |
| virtual ~GuestViewManagerTest() {} |
| scoped_ptr<WebContents> CreateWebContents() { |
| @@ -49,8 +53,9 @@ class GuestViewManagerTest : public testing::Test { |
| } |
| private: |
| + scoped_ptr<content::NotificationService> notification_service_; |
| content::TestBrowserThreadBundle thread_bundle_; |
| - TestingProfile profile_; |
| + content::TestBrowserContext profile_; |
|
Ken Rockot(use gerrit already)
2014/08/11 21:25:00
nit: Rename profile_ to browser_context_?
Xi Han
2014/08/11 21:38:11
Done.
|
| DISALLOW_COPY_AND_ASSIGN(GuestViewManagerTest); |
| }; |
| @@ -58,7 +63,7 @@ class GuestViewManagerTest : public testing::Test { |
| } // namespace |
| TEST_F(GuestViewManagerTest, AddRemove) { |
| - TestingProfile profile; |
| + content::TestBrowserContext profile; |
|
Ken Rockot(use gerrit already)
2014/08/11 21:25:00
nit: Rename profile -> browser_context?
Xi Han
2014/08/11 21:38:11
Done.
|
| scoped_ptr<guestview::TestGuestViewManager> manager( |
| new guestview::TestGuestViewManager(&profile)); |
| @@ -100,3 +105,5 @@ TEST_F(GuestViewManagerTest, AddRemove) { |
| EXPECT_EQ(0u, manager->GetRemovedInstanceIdSize()); |
| } |
| + |
| +} // namespace extensions |