Update SetPaintToLayer to accept LayerType

ui/views/widget/window_reorderer_unittest.cc

 // Copyright 2013 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 <memory>
 
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/compositor/test/test_layers.h"
 #include "ui/views/view.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 namespace {
 
 // Creates a control widget with the passed in parameters.
 // The caller takes ownership of the returned widget.
@@ skipping 37 matching lines @@
   parent->Show();
   aura::Window* parent_window = parent->GetNativeWindow();
 
   View* contents_view = new View();
   parent->SetContentsView(contents_view);
 
   // 1) Test that layers for views and layers for windows associated to a host
   // view are stacked below the layers for any windows not associated to a host
   // view.
   View* v = new View();
-  v->SetPaintToLayer(true);
+  v->SetPaintToLayer(ui::LAYER_TEXTURED);
   v->layer()->set_name("v");
   contents_view->AddChildView(v);
 
   std::unique_ptr<Widget> w1(
       CreateControlWidget(parent_window, gfx::Rect(0, 1, 100, 101)));
   SetWindowAndLayerName(w1->GetNativeView(), "w1");
   w1->Show();
   std::unique_ptr<Widget> w2(
       CreateControlWidget(parent_window, gfx::Rect(0, 2, 100, 102)));
   SetWindowAndLayerName(w2->GetNativeView(), "w2");
@@ skipping 128 matching lines @@
   // +-- v1
   //     +-- v11*
   //     +-- v12 (attached window)
   //     +-- v13*
   // +--v2*
 
   View* v1 = new View();
   contents_view->AddChildView(v1);
 
   View* v11 = new View();
-  v11->SetPaintToLayer(true);
+  v11->SetPaintToLayer(ui::LAYER_TEXTURED);
   v11->layer()->set_name("v11");
   v1->AddChildView(v11);
 
   std::unique_ptr<Widget> w(
       CreateControlWidget(parent_window, gfx::Rect(0, 1, 100, 101)));
   SetWindowAndLayerName(w->GetNativeView(), "w");
   w->Show();
 
   View* v12 = new View();
   v1->AddChildView(v12);
   w->GetNativeView()->SetProperty(kHostViewKey, v12);
 
   View* v13 = new View();
-  v13->SetPaintToLayer(true);
+  v13->SetPaintToLayer(ui::LAYER_TEXTURED);
   v13->layer()->set_name("v13");
   v1->AddChildView(v13);
 
   View* v2 = new View();
-  v2->SetPaintToLayer(true);
+  v2->SetPaintToLayer(ui::LAYER_TEXTURED);
   v2->layer()->set_name("v2");
   contents_view->AddChildView(v2);
 
   // Test intial state.
   EXPECT_EQ("w", ChildWindowNamesAsString(*parent_window));
   EXPECT_EQ("v11 w v13 v2",
             ui::test::ChildLayerNamesAsString(*parent_window->layer()));
 
   // |w|'s layer should be stacked above |v1|'s layer.
-  v1->SetPaintToLayer(true);
+  v1->SetPaintToLayer(ui::LAYER_TEXTURED);
   v1->layer()->set_name("v1");
   EXPECT_EQ("w", ChildWindowNamesAsString(*parent_window));
   EXPECT_EQ("v1 w v2",
             ui::test::ChildLayerNamesAsString(*parent_window->layer()));
 
   // Test moving the host view from one view with a layer to another.
   v2->AddChildView(v12);
   EXPECT_EQ("w", ChildWindowNamesAsString(*parent_window));
   EXPECT_EQ("v1 v2 w",
             ui::test::ChildLayerNamesAsString(*parent_window->layer()));
 
   // Work around for bug in NativeWidgetAura.
   // TODO: fix bug and remove this.
   parent->Close();
 }
 
 }  // namespace
 }  // namespace views