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

Unified Diff: chrome/browser/extensions/window_controls_browsertest.cc

Issue 23003004: Move apps tests from c/b/extensions to c/b/apps and refine DEPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Correct ordering in typi Created 7 years, 4 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
Index: chrome/browser/extensions/window_controls_browsertest.cc
diff --git a/chrome/browser/extensions/window_controls_browsertest.cc b/chrome/browser/extensions/window_controls_browsertest.cc
deleted file mode 100644
index a8bc46522568e2ed2248fce0398bfd6e4074edaf..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/window_controls_browsertest.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/extensions/extension_test_message_listener.h"
-#include "chrome/browser/extensions/platform_app_browsertest_util.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/common/chrome_switches.h"
-#include "content/public/browser/web_contents_view.h"
-#include "content/public/test/browser_test_utils.h"
-
-class WindowControlsTest : public extensions::PlatformAppBrowserTest {
- protected:
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
- extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
- command_line->AppendSwitch(switches::kEnableAppWindowControls);
- }
- content::WebContents* GetWebContentsForExtensionWindow(
- const extensions::Extension* extension);
-};
-
-content::WebContents* WindowControlsTest::GetWebContentsForExtensionWindow(
- const extensions::Extension* extension) {
- ExtensionProcessManager* process_manager =
- extensions::ExtensionSystem::Get(profile())->process_manager();
-
- // Lookup render view host for background page.
- const extensions::ExtensionHost* extension_host =
- process_manager->GetBackgroundHostForExtension(extension->id());
- content::RenderViewHost* background_view_host =
- extension_host->render_view_host();
-
- // Go through all active views, looking for the first window of the extension
- const ExtensionProcessManager::ViewSet all_views =
- process_manager->GetAllViews();
- ExtensionProcessManager::ViewSet::const_iterator it = all_views.begin();
- for (; it != all_views.end(); ++it) {
- content::RenderViewHost* host = *it;
-
- // Filter out views not part of this extension
- if (process_manager->GetExtensionForRenderViewHost(host) == extension) {
- // Filter out the background page view
- if (host != background_view_host) {
- content::WebContents* web_contents =
- content::WebContents::FromRenderViewHost(host);
- return web_contents;
- }
- }
- }
- return NULL;
-}
-
-IN_PROC_BROWSER_TEST_F(WindowControlsTest, CloseControlWorks) {
- // Launch app and wait for window to show up
- ExtensionTestMessageListener window_opened("window-opened", false);
- const extensions::Extension* extension =
- LoadAndLaunchPlatformApp("window_controls/buttons");
- ASSERT_TRUE(window_opened.WaitUntilSatisfied());
-
- // Find WebContents of window
- content::WebContents* web_contents =
- GetWebContentsForExtensionWindow(extension);
- ASSERT_TRUE(web_contents != NULL);
-
- // Send a left click on the "Close" button and wait for the close action
- // to happen.
- ExtensionTestMessageListener window_closed("window-closed", false);
-
- // Send mouse click somewhere inside the [x] button
- const int controlOffset = 25;
- int x = web_contents->GetView()->GetContainerSize().width() - controlOffset;
- int y = controlOffset;
- content::SimulateMouseClickAt(web_contents,
- 0,
- WebKit::WebMouseEvent::ButtonLeft,
- gfx::Point(x, y));
-
- ASSERT_TRUE(window_closed.WaitUntilSatisfied());
-}

Powered by Google App Engine
This is Rietveld 408576698