Revert of Add new gpu driver bug workaround DISABLE_TRANSPARENT_VISUALS

extensions/browser/api/app_window/app_window_apitest.cc

 // Copyright (c) 2012 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/compiler_specific.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/version_info/version_info.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/features/feature_channel.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "ui/base/base_window.h"
 #include "ui/gfx/geometry/rect.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/shell.h"
 #endif
 
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-#include "ui/gfx/x/x11_switches.h"
-#endif
-
 namespace extensions {
 
 namespace {
 
 class TestAppWindowRegistryObserver : public AppWindowRegistry::Observer {
  public:
   explicit TestAppWindowRegistryObserver(Profile* profile)
       : profile_(profile), icon_updates_(0) {
     AppWindowRegistry::Get(profile_)->AddObserver(this);
   }
@@ skipping 87 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiSetShapeNoPerm) {
   EXPECT_TRUE(
       RunPlatformAppTest("platform_apps/windows_api_shape/no_permission"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
                        WindowsApiAlphaEnabledHasPermissions) {
-  const char kNoAlphaDir[] =
+  const char* no_alpha_dir =
       "platform_apps/windows_api_alpha_enabled/has_permissions_no_alpha";
-  const char kHasAlphaDir[] =
-      "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha";
-  ALLOW_UNUSED_LOCAL(kHasAlphaDir);
-  const char* test_dir = kNoAlphaDir;
+  const char* test_dir = no_alpha_dir;
 
 #if defined(USE_AURA) && (defined(OS_CHROMEOS) || !defined(OS_LINUX))
-  test_dir = kHasAlphaDir;
-
+  test_dir =
+      "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha";
 #if defined(OS_WIN)
   if (!ui::win::IsAeroGlassEnabled()) {
-    test_dir = kNoAlphaDir;
+    test_dir = no_alpha_dir;
   }
 #endif  // OS_WIN
 #endif  // USE_AURA && (OS_CHROMEOS || !OS_LINUX)
 
-#if defined(USE_X11) && !defined(OS_CHROMEOS)
-  if (base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kWindowDepth) == "32") {
-    test_dir = kHasAlphaDir;
-  }
-#endif  // USE_X11 && !OS_CHROMEOS
-
   EXPECT_TRUE(RunPlatformAppTest(test_dir)) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
                        WindowsApiAlphaEnabledNoPermissions) {
   EXPECT_TRUE(RunPlatformAppTest(
       "platform_apps/windows_api_alpha_enabled/no_permissions"))
       << message_;
 }
 
@@ skipping 53 matching lines @@
   command_line->AppendSwitchASCII(switches::kAppId,
                                   "jkghodnilhceideoidjikpgommlajknk");
 
   EXPECT_TRUE(RunComponentExtensionTest(
       "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen"))
       << message_;
 }
 #endif  // OS_CHROMEOS
 
 }  // namespace extensions