aura: Defer OutputSurface creation until widget is available

ui/compositor/layer_owner_unittest.cc

 // Copyright 2014 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 "ui/compositor/layer_owner.h"
 
 #include "base/test/null_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
@@ skipping 50 matching lines @@
 }
 
 void LayerOwnerTestWithCompositor::SetUp() {
   scoped_refptr<base::SingleThreadTaskRunner> task_runner =
       new base::NullTaskRunner();
 
   ui::ContextFactory* context_factory =
       ui::InitializeContextFactoryForTests(false);
 
   compositor_.reset(new ui::Compositor(context_factory, task_runner));
-  compositor_->SetAcceleratedWidgetAndStartCompositor(
-      gfx::kNullAcceleratedWidget);
+  compositor_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
 }
 
 void LayerOwnerTestWithCompositor::TearDown() {
   compositor_.reset();
   ui::TerminateContextFactoryForTests();
 }
 
 }  // namespace
 
 TEST(LayerOwnerTest, RecreateLayerHonorsAnimationTargets) {
@@ skipping 129 matching lines @@
     animation.AddObserver(observer.get());
     gfx::Transform transform;
     transform.Scale(0.5f, 0.5f);
     child->SetTransform(transform);
   }
 
   scoped_ptr<Layer> layer_copy = owner.RecreateLayer();
 }
 
 }  // namespace ui