Move GuestView layer in browser to components

components/guest_view/browser/guest_view_manager_unittest.cc

Index: components/guest_view/browser/guest_view_manager_unittest.cc
diff --git a/extensions/browser/guest_view/guest_view_manager_unittest.cc b/components/guest_view/browser/guest_view_manager_unittest.cc
similarity index 67%
rename from extensions/browser/guest_view/guest_view_manager_unittest.cc
rename to components/guest_view/browser/guest_view_manager_unittest.cc
index 2a380e4e3b9e8ecef591bd417757b6529f3a4126..46df02a7656542d9a864ceaaa038cf4a115ba565 100644
--- a/extensions/browser/guest_view/guest_view_manager_unittest.cc
+++ b/components/guest_view/browser/guest_view_manager_unittest.cc
@@ -2,30 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "extensions/browser/guest_view/guest_view_manager.h"
-
-#include "content/public/browser/notification_service.h"
+#include "components/guest_view/browser/guest_view_manager.h"
+#include "components/guest_view/browser/guest_view_manager_delegate.h"
+#include "components/guest_view/browser/test_guest_view_manager.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 "extensions/browser/extensions_test.h"
-#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
-#include "extensions/browser/guest_view/guest_view_manager.h"
-#include "extensions/browser/guest_view/guest_view_manager_delegate.h"
-#include "extensions/browser/guest_view/test_guest_view_manager.h"
+#include "content/test/test_render_view_host.h"

[jam, 2015/05/04 16:11:09]

you can't include from inside content. why did you change this?

[Fady Samuel, 2015/05/04 20:24:32]

Doh! Meant to include: #include "content/public/test/test_renderer_host.h"

Fixed, thanks!

+#include "testing/gtest/include/gtest/gtest.h"
 
 using content::WebContents;
 using content::WebContentsTester;
-using guestview::GuestViewManagerDelegate;
 
-namespace extensions {
+namespace guest_view {
 
 namespace {
 
-class GuestViewManagerTest : public extensions::ExtensionsTest {
+class GuestViewManagerTest : public content::RenderViewHostTestHarness {
  public:
-  GuestViewManagerTest() :
-    notification_service_(content::NotificationService::Create()) {}
+  GuestViewManagerTest() {}
   ~GuestViewManagerTest() override {}
 
   scoped_ptr<WebContents> CreateWebContents() {
@@ -34,8 +28,6 @@ class GuestViewManagerTest : public extensions::ExtensionsTest {
   }
 
  private:
-  scoped_ptr<content::NotificationService> notification_service_;
-  content::TestBrowserThreadBundle thread_bundle_;
   content::TestBrowserContext browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewManagerTest);
@@ -46,9 +38,9 @@ class GuestViewManagerTest : public extensions::ExtensionsTest {
 TEST_F(GuestViewManagerTest, AddRemove) {
   content::TestBrowserContext browser_context;
   scoped_ptr<GuestViewManagerDelegate> delegate(
-      new ExtensionsGuestViewManagerDelegate(&browser_context));
+      new GuestViewManagerDelegate());
   scoped_ptr<TestGuestViewManager> manager(
-      new extensions::TestGuestViewManager(&browser_context, delegate.Pass()));
+      new TestGuestViewManager(&browser_context, delegate.Pass()));
 
   scoped_ptr<WebContents> web_contents1(CreateWebContents());
   scoped_ptr<WebContents> web_contents2(CreateWebContents());
@@ -86,7 +78,7 @@ TEST_F(GuestViewManagerTest, AddRemove) {
   EXPECT_FALSE(manager->CanUseGuestInstanceID(2));
   EXPECT_FALSE(manager->CanUseGuestInstanceID(3));
 
-  EXPECT_EQ(0, manager->GetNumRemovedInstanceIDs());
+  EXPECT_EQ(0u, manager->GetNumRemovedInstanceIDs());
 }
 
-}  // namespace extensions
+}  // namespace guest_view