diff options
23 files changed, 37 insertions, 37 deletions
@@ -12,6 +12,7 @@ include_rules = [ "+win8", # Temporary allowed includes. # TODO(benwells): remove these (http://crbug.com/159366) + "+chrome/browser/apps/app_browsertest_util.h", "+chrome/browser/browser_process.h", "+chrome/browser/browser_shutdown.h", "+chrome/browser/chrome_notification_types.h", diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc index c3bac8f..88ceb65 100644 --- a/apps/app_restore_service_browsertest.cc +++ b/apps/app_restore_service_browsertest.cc @@ -5,11 +5,11 @@ #include "apps/app_restore_service.h" #include "apps/app_restore_service_factory.h" #include "apps/saved_files_service.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" diff --git a/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm b/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm index f16caef..5b5dad6 100644 --- a/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm +++ b/apps/app_shim/app_shim_quit_interactive_uitest_mac.mm @@ -9,11 +9,11 @@ #include "apps/app_shim/app_shim_host_manager_mac.h" #include "apps/app_shim/extension_app_shim_handler_mac.h" #include "apps/switches.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/extensions/extension_service.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 "chrome/test/base/interactive_test_utils.h" diff --git a/apps/load_and_launch_browsertest.cc b/apps/load_and_launch_browsertest.cc index 620152e..40f748c 100644 --- a/apps/load_and_launch_browsertest.cc +++ b/apps/load_and_launch_browsertest.cc @@ -9,9 +9,9 @@ #include "apps/switches.h" #include "base/process/launch.h" #include "base/test/test_timeouts.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" #include "content/public/test/test_launcher.h" diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 4e66e35..224374d 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -9,8 +9,8 @@ #include "base/mac/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/extensions/ad_view_browsertest.cc b/chrome/browser/apps/ad_view_browsertest.cc index 4982cb25..7c15b3e 100644 --- a/chrome/browser/extensions/ad_view_browsertest.cc +++ b/chrome/browser/apps/ad_view_browsertest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/common/chrome_switches.h" #include "content/test/net/url_request_prepackaged_interceptor.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc index 8126988..5110f4f 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/apps/app_browsertest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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. @@ -16,6 +16,7 @@ #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/devtools/devtools_window.h" @@ -28,7 +29,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/apps/app_browsertest_util.cc index 3348a00..7a2f9ce 100644 --- a/chrome/browser/extensions/platform_app_browsertest_util.cc +++ b/chrome/browser/apps/app_browsertest_util.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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/platform_app_browsertest_util.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "apps/app_window_contents.h" #include "apps/native_app_window.h" diff --git a/chrome/browser/extensions/platform_app_browsertest_util.h b/chrome/browser/apps/app_browsertest_util.h index 6cc179b..aa4efcd1 100644 --- a/chrome/browser/extensions/platform_app_browsertest_util.h +++ b/chrome/browser/apps/app_browsertest_util.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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. -#ifndef CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_ -#define CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_ +#ifndef CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ +#define CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ #include "apps/shell_window.h" @@ -89,4 +89,4 @@ class ExperimentalPlatformAppBrowserTest : public PlatformAppBrowserTest { } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_PLATFORM_APP_BROWSERTEST_UTIL_H_ +#endif // CHROME_BROWSER_APPS_APP_BROWSERTEST_UTIL_H_ diff --git a/chrome/browser/extensions/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index 57c589a..b16d3bd 100644 --- a/chrome/browser/extensions/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// 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 "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/prerender/prerender_link_manager.h" #include "chrome/browser/prerender/prerender_link_manager_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/web_view_interactive_browsertest.cc b/chrome/browser/apps/web_view_interactive_browsertest.cc index 170fb9b..903af99 100644 --- a/chrome/browser/extensions/web_view_interactive_browsertest.cc +++ b/chrome/browser/apps/web_view_interactive_browsertest.cc @@ -6,8 +6,8 @@ #include "apps/shell_window_registry.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/window_controls_browsertest.cc b/chrome/browser/apps/window_controls_browsertest.cc index a8bc465..f5b5025 100644 --- a/chrome/browser/extensions/window_controls_browsertest.cc +++ b/chrome/browser/apps/window_controls_browsertest.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/apps/app_browsertest_util.h" #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" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index f37386d..2532fdf 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc @@ -17,12 +17,12 @@ #include "base/test/scoped_path_override.h" #include "base/threading/sequenced_worker_pool.h" #include "base/time/time.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_update_service.h" #include "chrome/browser/chromeos/system/automatic_reboot_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 "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/DEPS b/chrome/browser/extensions/DEPS index d16e654..3cc3516 100644 --- a/chrome/browser/extensions/DEPS +++ b/chrome/browser/extensions/DEPS @@ -4,11 +4,9 @@ include_rules = [ # chrome/browser/extensions, the restriction of not being able # to depend on apps will be lifted. "-apps", - "+apps/app_window_contents.h", - "+apps/launcher.h", - "+apps/native_app_window.h", "+apps/shell_window.h", "+apps/shell_window_registry.h", + "-chrome/browser/apps", # TODO(tfarina): Remove all these. crbug.com/125846. # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW! diff --git a/chrome/browser/extensions/api/DEPS b/chrome/browser/extensions/api/DEPS index 6d699a6..d3338bd 100644 --- a/chrome/browser/extensions/api/DEPS +++ b/chrome/browser/extensions/api/DEPS @@ -1,3 +1,4 @@ include_rules = [ "+apps", + "+chrome/browser/apps", ] diff --git a/chrome/browser/extensions/api/app_window/app_window_apitest.cc b/chrome/browser/extensions/api/app_window/app_window_apitest.cc index a4f3909..23d4945 100644 --- a/chrome/browser/extensions/api/app_window/app_window_apitest.cc +++ b/chrome/browser/extensions/api/app_window/app_window_apitest.cc @@ -7,8 +7,8 @@ #include "apps/shell_window_registry.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/base/testing_profile.h" #include "ui/base/base_window.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index 9f1c709..90c90bf 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc @@ -6,10 +6,10 @@ #include "base/file_util.h" #include "base/path_service.h" #include "build/build_config.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc index d89bb6c..73aaeb4 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc @@ -8,11 +8,11 @@ #include "base/files/scoped_temp_dir.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" diff --git a/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc b/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc index 553c729..1f9760a 100644 --- a/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc +++ b/chrome/browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" // Supported on all platforms, but on Windows only if RLZ is enabled. #if !defined(OS_WIN) || defined(ENABLE_RLZ) diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc index c03aae9..c7dee54 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc @@ -12,7 +12,7 @@ #include "ash/wm/window_properties.h" #include "ash/wm/window_util.h" #include "base/command_line.h" -#include "chrome/browser/extensions/platform_app_browsertest_util.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 801538a..c68476c 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -17,6 +17,7 @@ #include "base/command_line.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -25,7 +26,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.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/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc index 248b19a..4c35a21 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app_browsertest.cc @@ -18,6 +18,7 @@ #include "ash/test/shell_test_api.h" #include "ash/wm/window_util.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/automation/automation_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -26,7 +27,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.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/browser/ui/app_list/app_list_service.h" #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h" diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 4a43df7..cfb0361 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -206,6 +206,9 @@ ], 'sources': [ '../apps/app_shim/app_shim_quit_interactive_uitest_mac.mm', + 'browser/apps/app_browsertest_util.cc', + 'browser/apps/app_browsertest_util.h', + 'browser/apps/web_view_interactive_browsertest.cc', 'browser/autofill/autofill_interactive_uitest.cc', 'browser/browser_keyevents_browsertest.cc', 'browser/extensions/api/omnibox/omnibox_api_interactive_test.cc', @@ -218,9 +221,6 @@ 'browser/extensions/extension_test_message_listener.cc', 'browser/extensions/extension_test_message_listener.h', 'browser/extensions/notifications_apitest.cc', - 'browser/extensions/platform_app_browsertest_util.cc', - 'browser/extensions/platform_app_browsertest_util.h', - 'browser/extensions/web_view_interactive_browsertest.cc', 'browser/extensions/window_open_interactive_apitest.cc', 'browser/extensions/extension_fullscreen_apitest.cc', 'browser/extensions/extension_pointer_lock_apitest.cc', @@ -1162,6 +1162,12 @@ 'browser/accessibility/accessibility_extension_apitest.cc', 'browser/accessibility/browser_accessibility_state_browsertest.cc', 'browser/app_controller_mac_browsertest.mm', + 'browser/apps/ad_view_browsertest.cc', + 'browser/apps/app_browsertest.cc', + 'browser/apps/app_browsertest_util.cc', + 'browser/apps/app_browsertest_util.h', + 'browser/apps/web_view_browsertest.cc', + 'browser/apps/window_controls_browsertest.cc', 'browser/autocomplete/autocomplete_browsertest.cc', 'browser/autofill/autofill_browsertest.cc', 'browser/autofill/autofill_driver_impl_browsertest.cc', @@ -1262,7 +1268,6 @@ 'browser/errorpage_browsertest.cc', 'browser/extensions/active_tab_apitest.cc', 'browser/extensions/activity_log/activity_log_browsertest.cc', - 'browser/extensions/ad_view_browsertest.cc', 'browser/extensions/alert_apitest.cc', 'browser/extensions/all_urls_apitest.cc', 'browser/extensions/api/activity_log_private/activity_log_private_apitest.cc', @@ -1404,9 +1409,6 @@ 'browser/extensions/mutation_observers_apitest.cc', 'browser/extensions/options_page_apitest.cc', 'browser/extensions/page_action_browsertest.cc', - 'browser/extensions/platform_app_browsertest.cc', - 'browser/extensions/platform_app_browsertest_util.cc', - 'browser/extensions/platform_app_browsertest_util.h', 'browser/extensions/plugin_apitest.cc', 'browser/extensions/process_management_browsertest.cc', 'browser/extensions/requirements_checker_browsertest.cc', @@ -1417,9 +1419,7 @@ 'browser/extensions/subscribe_page_action_browsertest.cc', 'browser/extensions/test_extension_dir.cc', 'browser/extensions/test_extension_dir.h', - 'browser/extensions/window_controls_browsertest.cc', 'browser/extensions/web_contents_browsertest.cc', - 'browser/extensions/web_view_browsertest.cc', 'browser/extensions/webstore_startup_installer_browsertest.cc', 'browser/extensions/window_open_apitest.cc', 'browser/external_extension_browsertest.cc', |