Remove the ash-enable-touch-view-testing flag

ash/wm/session_state_animator.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 "ash/wm/session_state_animator.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 bool IsTouchViewEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kAshEnableTouchView) ||
-         base::CommandLine::ForCurrentProcess()->HasSwitch(
-             switches::kAshEnableTouchViewTesting);
+      switches::kAshEnableTouchView);
 }
 
 }  // namespace
 
 const int SessionStateAnimator::kAllLockScreenContainersMask =
     SessionStateAnimator::LOCK_SCREEN_WALLPAPER |
     SessionStateAnimator::LOCK_SCREEN_CONTAINERS |
     SessionStateAnimator::LOCK_SCREEN_RELATED_CONTAINERS;
 
 const int SessionStateAnimator::kAllNonRootContainersMask =
@@ skipping 62 matching lines @@
     case ANIMATION_SPEED_REVERT_SHUTDOWN:
       return base::TimeDelta::FromMilliseconds(500);
   }
   // Satisfy compilers that do not understand that we will return from switch
   // above anyway.
   DCHECK(false) << "Unhandled animation speed " << speed;
   return base::TimeDelta();
 }
 
 }  // namespace ash