| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "chrome/browser/apps/app_browsertest_util.h" | 6 #include "chrome/browser/apps/app_browsertest_util.h" |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" | 8 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" |
| 9 #include "chrome/browser/extensions/component_loader.h" | 9 #include "chrome/browser/extensions/component_loader.h" |
| 10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/common/extensions/api/feedback_private.h" | 13 #include "chrome/common/extensions/api/feedback_private.h" |
| 14 #include "chrome/test/base/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "content/public/common/content_switches.h" | 15 #include "content/public/common/content_switches.h" |
| 16 #include "content/public/test/test_utils.h" | 16 #include "content/public/test/test_utils.h" |
| 17 #include "extensions/browser/app_window/app_window.h" | 17 #include "extensions/browser/app_window/app_window.h" |
| 18 #include "extensions/browser/app_window/app_window_registry.h" | 18 #include "extensions/browser/app_window/app_window_registry.h" |
| 19 #include "extensions/browser/event_router.h" | 19 #include "extensions/browser/event_router.h" |
| 20 #include "extensions/browser/extension_system.h" | 20 #include "extensions/browser/extension_system.h" |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 void StopMessageLoopCallback() { | 24 void StopMessageLoopCallback() { |
| 25 base::MessageLoopForUI::current()->Quit(); | 25 base::MessageLoopForUI::current()->QuitWhenIdle(); |
| 26 } | 26 } |
| 27 | 27 |
| 28 } // namespace | 28 } // namespace |
| 29 | 29 |
| 30 namespace extensions { | 30 namespace extensions { |
| 31 | 31 |
| 32 class FeedbackTest : public ExtensionBrowserTest { | 32 class FeedbackTest : public ExtensionBrowserTest { |
| 33 public: | 33 public: |
| 34 void SetUp() override { | 34 void SetUp() override { |
| 35 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); | 35 extensions::ComponentLoader::EnableBackgroundExtensionsForTesting(); |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 // See http://crbug.com/369886. | 80 // See http://crbug.com/369886. |
| 81 IN_PROC_BROWSER_TEST_F(FeedbackTest, DISABLED_ShowFeedback) { | 81 IN_PROC_BROWSER_TEST_F(FeedbackTest, DISABLED_ShowFeedback) { |
| 82 WaitForExtensionViewsToLoad(); | 82 WaitForExtensionViewsToLoad(); |
| 83 | 83 |
| 84 ASSERT_TRUE(IsFeedbackAppAvailable()); | 84 ASSERT_TRUE(IsFeedbackAppAvailable()); |
| 85 StartFeedbackUI(); | 85 StartFeedbackUI(); |
| 86 VerifyFeedbackAppLaunch(); | 86 VerifyFeedbackAppLaunch(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace extensions | 89 } // namespace extensions |
| OLD | NEW |