Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / apps / app_window_browsertest.cc

diff --git a/src/chrome/browser/apps/app_window_browsertest.cc b/src/chrome/browser/apps/app_window_browsertest.cc
index ff549ce..dd444d3 100644 (file)
--- a/src/chrome/browser/apps/app_window_browsertest.cc
+++ b/src/chrome/browser/apps/app_window_browsertest.cc
@@ -46,10 +46,9 @@ class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer {
   }
 
   // Implements the content::NotificationObserver interface.
-  virtual void OnGeometryCacheChanged(const std::string& extension_id,
-                                      const std::string& window_id,
-                                      const gfx::Rect& bounds)
-      OVERRIDE {
+  void OnGeometryCacheChanged(const std::string& extension_id,
+                              const std::string& window_id,
+                              const gfx::Rect& bounds) override {
     if (extension_id != extension_id_ || window_id != window_id_)
       return;
 
@@ -144,6 +143,17 @@ IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestMaximize) {
   ASSERT_TRUE(RunAppWindowAPITest("testMaximize")) << message_;
 }
 
+// Flaky on Linux. http://crbug.com/424399.
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#define MAYBE_TestMinimize DISABLED_TestMinimize
+#else
+#define MAYBE_TestMinimize TestMinimize
+#endif
+
+IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestMinimize) {
+  ASSERT_TRUE(RunAppWindowAPITest("testMinimize")) << message_;
+}
+
 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestRestore) {
   ASSERT_TRUE(RunAppWindowAPITest("testRestore")) << message_;
 }
@@ -250,14 +260,6 @@ IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestBadging) {
 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) {
   ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
 }
-
-// TODO(benwells): Remove this test once all the things are merged together. It
-// is currently present as this feature was previously disabled on stable
-// channel, so the test is to ensure it has all been re-enabled properly.
-IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) {
-  extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
-  ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
-}
 #endif
 
 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) {