// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
#include "base/bind.h"
#include "chrome/browser/apps/app_browsertest_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h"
#include "chrome/browser/extensions/component_loader.h"
-#include "chrome/browser/extensions/event_router.h"
#include "chrome/browser/extensions/extension_browsertest.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/extensions/api/feedback_private.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/common/content_switches.h"
+#include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_system.h"
-using apps::ShellWindow;
-using apps::ShellWindowRegistry;
+using apps::AppWindow;
+using apps::AppWindowRegistry;
using extensions::Extension;
namespace {
protected:
bool IsFeedbackAppAvailable() {
- return extensions::ExtensionSystem::Get(
- browser()->profile())->event_router()->ExtensionHasEventListener(
+ return extensions::EventRouter::Get(browser()->profile())
+ ->ExtensionHasEventListener(
kFeedbackExtensionId,
extensions::api::feedback_private::OnFeedbackRequested::kEventName);
}
}
void VerifyFeedbackAppLaunch() {
- ShellWindow* window =
- PlatformAppBrowserTest::GetFirstShellWindowForBrowser(browser());
+ AppWindow* window =
+ PlatformAppBrowserTest::GetFirstAppWindowForBrowser(browser());
ASSERT_TRUE(window);
- const Extension* feedback_app = window->extension();
+ const Extension* feedback_app = window->GetExtension();
ASSERT_TRUE(feedback_app);
EXPECT_EQ(feedback_app->id(), std::string(kFeedbackExtensionId));
}
private:
void InvokeFeedbackUI() {
extensions::FeedbackPrivateAPI* api =
- extensions::FeedbackPrivateAPI::GetFactoryInstance()->GetForProfile(
+ extensions::FeedbackPrivateAPI::GetFactoryInstance()->Get(
browser()->profile());
api->RequestFeedback("Test description",
"Test tag",
}
};
-IN_PROC_BROWSER_TEST_F(FeedbackTest, ShowFeedback) {
+// See http://crbug.com/369886.
+IN_PROC_BROWSER_TEST_F(FeedbackTest, DISABLED_ShowFeedback) {
WaitForExtensionViewsToLoad();
ASSERT_TRUE(IsFeedbackAppAvailable());