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

Unified Diff: components/web_modal/web_contents_modal_dialog_manager_unittest.cc

Issue 14969012: components: Create web_modal component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-before-land Created 7 years, 7 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
« no previous file with comments | « components/web_modal/web_contents_modal_dialog_manager_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_modal/web_contents_modal_dialog_manager_unittest.cc
diff --git a/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
similarity index 79%
rename from chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
rename to components/web_modal/web_contents_modal_dialog_manager_unittest.cc
index 9fa84044b0b95ff1d7fcee2ba6fb1e268087e048..613182bdb592f6d0d269181a20dfe519e40bab5e 100644
--- a/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
@@ -2,24 +2,25 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/native_web_contents_modal_dialog_manager.h"
-#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
-#include "chrome/test/base/chrome_render_view_host_test_harness.h"
+#include "components/web_modal/native_web_contents_modal_dialog_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_renderer_host.h"
#include "testing/gtest/include/gtest/gtest.h"
using content::BrowserThread;
+namespace web_modal {
+
class WebContentsModalDialogManagerTest
- : public ChromeRenderViewHostTestHarness {
+ : public content::RenderViewHostTestHarness {
public:
WebContentsModalDialogManagerTest()
- : ChromeRenderViewHostTestHarness(),
- ui_thread_(BrowserThread::UI, &message_loop_) {
+ : ui_thread_(BrowserThread::UI, &message_loop_) {
}
virtual void SetUp() {
- ChromeRenderViewHostTestHarness::SetUp();
+ content::RenderViewHostTestHarness::SetUp();
WebContentsModalDialogManager::CreateForWebContents(web_contents());
}
@@ -52,6 +53,12 @@ class NativeWebContentsModalDialogManagerCloseTest
NativeWebContentsModalDialogManagerDelegate* delegate_;
};
+NativeWebContentsModalDialogManager* WebContentsModalDialogManager::
+CreateNativeManager(
+ NativeWebContentsModalDialogManagerDelegate* native_delegate) {
+ return new NativeWebContentsModalDialogManagerCloseTest(native_delegate);
+}
+
TEST_F(WebContentsModalDialogManagerTest, WebContentsModalDialogs) {
WebContentsModalDialogManager* web_contents_modal_dialog_manager =
WebContentsModalDialogManager::FromWebContents(web_contents());
@@ -77,3 +84,5 @@ TEST_F(WebContentsModalDialogManagerTest, WebContentsModalDialogs) {
test_api.CloseAllDialogs();
EXPECT_EQ(native_manager->close_count, kWindowCount);
}
+
+} // namespace web_modal
« no previous file with comments | « components/web_modal/web_contents_modal_dialog_manager_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698