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

Unified Diff: chrome/browser/extensions/platform_app_browsertest_util.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/platform_app_browsertest_util.cc
diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/extensions/platform_app_browsertest_util.cc
deleted file mode 100644
index 3348a00cc08a16ad701044f1967183e7c257e31b..0000000000000000000000000000000000000000
--- a/chrome/browser/extensions/platform_app_browsertest_util.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) 2012 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/platform_app_browsertest_util.h"
-
-#include "apps/app_window_contents.h"
-#include "apps/native_app_window.h"
-#include "apps/shell_window_registry.h"
-#include "base/command_line.h"
-#include "base/strings/stringprintf.h"
-#include "chrome/browser/extensions/api/tabs/tabs_api.h"
-#include "chrome/browser/extensions/extension_function_test_utils.h"
-#include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/extensions/application_launch.h"
-#include "chrome/common/chrome_switches.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/test/test_utils.h"
-#include "extensions/common/switches.h"
-
-using apps::ShellWindow;
-using apps::ShellWindowRegistry;
-using content::WebContents;
-
-namespace utils = extension_function_test_utils;
-
-namespace extensions {
-
-PlatformAppBrowserTest::PlatformAppBrowserTest() {
- ChromeShellWindowDelegate::DisableExternalOpenForTesting();
-}
-
-void PlatformAppBrowserTest::SetUpCommandLine(CommandLine* command_line) {
- // Skips ExtensionApiTest::SetUpCommandLine.
- ExtensionBrowserTest::SetUpCommandLine(command_line);
-
- // Make event pages get suspended quicker.
- command_line->AppendSwitchASCII(::switches::kEventPageIdleTime, "1");
- command_line->AppendSwitchASCII(::switches::kEventPageSuspendingTime, "1");
-}
-
-const Extension* PlatformAppBrowserTest::LoadAndLaunchPlatformApp(
- const char* name) {
- content::WindowedNotificationObserver app_loaded_observer(
- content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
- content::NotificationService::AllSources());
-
- const Extension* extension = LoadExtension(
- test_data_dir_.AppendASCII("platform_apps").AppendASCII(name));
- EXPECT_TRUE(extension);
-
- chrome::OpenApplication(chrome::AppLaunchParams(browser()->profile(),
- extension,
- extension_misc::LAUNCH_NONE,
- NEW_WINDOW));
-
- app_loaded_observer.Wait();
-
- return extension;
-}
-
-const Extension* PlatformAppBrowserTest::InstallAndLaunchPlatformApp(
- const char* name) {
- content::WindowedNotificationObserver app_loaded_observer(
- content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
- content::NotificationService::AllSources());
-
- const Extension* extension = InstallExtension(
- test_data_dir_.AppendASCII("platform_apps").AppendASCII(name), 1);
- EXPECT_TRUE(extension);
-
- chrome::OpenApplication(chrome::AppLaunchParams(browser()->profile(),
- extension,
- extension_misc::LAUNCH_NONE,
- NEW_WINDOW));
-
- app_loaded_observer.Wait();
-
- return extension;
-}
-
-WebContents* PlatformAppBrowserTest::GetFirstShellWindowWebContents() {
- ShellWindow* window = GetFirstShellWindow();
- if (window)
- return window->web_contents();
-
- return NULL;
-}
-
-ShellWindow* PlatformAppBrowserTest::GetFirstShellWindow() {
- ShellWindowRegistry* app_registry =
- ShellWindowRegistry::Get(browser()->profile());
- const ShellWindowRegistry::ShellWindowList& shell_windows =
- app_registry->shell_windows();
-
- ShellWindowRegistry::const_iterator iter = shell_windows.begin();
- if (iter != shell_windows.end())
- return *iter;
-
- return NULL;
-}
-
-size_t PlatformAppBrowserTest::RunGetWindowsFunctionForExtension(
- const Extension* extension) {
- scoped_refptr<WindowsGetAllFunction> function = new WindowsGetAllFunction();
- function->set_extension(extension);
- scoped_ptr<base::ListValue> result(utils::ToList(
- utils::RunFunctionAndReturnSingleResult(function.get(),
- "[]",
- browser())));
- return result->GetSize();
-}
-
-bool PlatformAppBrowserTest::RunGetWindowFunctionForExtension(
- int window_id,
- const Extension* extension) {
- scoped_refptr<WindowsGetFunction> function = new WindowsGetFunction();
- function->set_extension(extension);
- utils::RunFunction(
- function.get(),
- base::StringPrintf("[%u]", window_id),
- browser(),
- utils::NONE);
- return function->GetResultList() != NULL;
-}
-
-size_t PlatformAppBrowserTest::GetShellWindowCount() {
- return ShellWindowRegistry::Get(browser()->profile())->
- shell_windows().size();
-}
-
-void PlatformAppBrowserTest::ClearCommandLineArgs() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- CommandLine::StringVector args = command_line->GetArgs();
- CommandLine::StringVector argv = command_line->argv();
- for (size_t i = 0; i < args.size(); i++)
- argv.pop_back();
- command_line->InitFromArgv(argv);
-}
-
-void PlatformAppBrowserTest::SetCommandLineArg(const std::string& test_file) {
- ClearCommandLineArgs();
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- base::FilePath test_doc(test_data_dir_.AppendASCII(test_file));
- test_doc = test_doc.NormalizePathSeparators();
- command_line->AppendArgPath(test_doc);
-}
-
-ShellWindow* PlatformAppBrowserTest::CreateShellWindow(
- const Extension* extension) {
- return CreateShellWindowFromParams(extension, ShellWindow::CreateParams());
-}
-
-ShellWindow* PlatformAppBrowserTest::CreateShellWindowFromParams(
- const Extension* extension, const ShellWindow::CreateParams& params) {
- ShellWindow* window = new ShellWindow(browser()->profile(),
- new ChromeShellWindowDelegate(),
- extension);
- window->Init(GURL(std::string()),
- new apps::AppWindowContents(window),
- params);
- return window;
-}
-
-void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) {
- content::WindowedNotificationObserver destroyed_observer(
- content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
- content::NotificationService::AllSources());
- window->GetBaseWindow()->Close();
- destroyed_observer.Wait();
-}
-
-void PlatformAppBrowserTest::CallAdjustBoundsToBeVisibleOnScreenForShellWindow(
- ShellWindow* window,
- const gfx::Rect& cached_bounds,
- const gfx::Rect& cached_screen_bounds,
- const gfx::Rect& current_screen_bounds,
- const gfx::Size& minimum_size,
- gfx::Rect* bounds) {
- window->AdjustBoundsToBeVisibleOnScreen(cached_bounds,
- cached_screen_bounds,
- current_screen_bounds,
- minimum_size,
- bounds);
-}
-
-void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
- CommandLine* command_line) {
- PlatformAppBrowserTest::SetUpCommandLine(command_line);
- command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
-}
-
-} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/platform_app_browsertest_util.h ('k') | chrome/browser/extensions/web_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698