Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / feedback_private / feedback_browsertest.cc

diff --git a/src/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/src/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc
index 99bde53..152ebc9 100644 (file)
--- a/src/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc
+++ b/src/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc
@@ -47,8 +47,8 @@ class FeedbackTest : public ExtensionBrowserTest {
 
  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);
   }
@@ -65,7 +65,7 @@ class FeedbackTest : public ExtensionBrowserTest {
     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));
   }
@@ -81,7 +81,8 @@ class FeedbackTest : public ExtensionBrowserTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(FeedbackTest, ShowFeedback) {
+// See http://crbug.com/369886.
+IN_PROC_BROWSER_TEST_F(FeedbackTest, DISABLED_ShowFeedback) {
   WaitForExtensionViewsToLoad();
 
   ASSERT_TRUE(IsFeedbackAppAvailable());