Revert 238458 "cc: Defer first OutputSurface creation until clie..."

trunk/src/content/test/test_webkit_platform_support.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 "content/test/test_webkit_platform_support.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 285 matching lines @@
   std::string path_ascii = path.MaybeAsASCII();
   CHECK(!path_ascii.empty());
   return blink::WebString::fromUTF8(path_ascii.c_str());
 }
 
 blink::WebLayerTreeView*
 TestWebKitPlatformSupport::createLayerTreeViewForTesting() {
   scoped_ptr<WebLayerTreeViewImplForTesting> view(
       new WebLayerTreeViewImplForTesting());
 
-  view->Initialize();
+  if (!view->Initialize())
+    return NULL;
   return view.release();
 }
 
 blink::WebLayerTreeView*
 TestWebKitPlatformSupport::createLayerTreeViewForTesting(TestViewType type) {
   DCHECK_EQ(TestViewTypeUnitTest, type);
   return createLayerTreeViewForTesting();
 }
 
 blink::WebData TestWebKitPlatformSupport::readFromFile(
     const blink::WebString& path) {
   base::FilePath file_path = base::FilePath::FromUTF16Unsafe(path);
 
   std::string buffer;
   base::ReadFileToString(file_path, &buffer);
 
   return blink::WebData(buffer.data(), buffer.size());
 }
 
 }  // namespace content