Require WebLocalFrame to be created with a non-null client

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 5871 matching lines @@
         , m_willSendRequestCallCount(0)
         , m_childFrameCreationCount(0)
     {
     }
 
     void setChildWebFrameClient(TestCachePolicyWebFrameClient* client) { m_childClient = client; }
     WebCachePolicy getCachePolicy() const { return m_policy; }
     int willSendRequestCallCount() const { return m_willSendRequestCallCount; }
     int childFrameCreationCount() const { return m_childFrameCreationCount; }
 
-    virtual WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
+    virtual WebLocalFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString&, const WebString&, WebSandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
     {
         DCHECK(m_childClient);
         m_childFrameCreationCount++;
-        WebFrame* frame = WebLocalFrame::create(scope, m_childClient);
+        WebLocalFrame* frame = WebLocalFrame::create(scope, m_childClient);
         parent->appendChild(frame);
         return frame;
     }
 
     virtual void didStartLoading(bool toDifferentDocument)
     {
         if (m_parentClient) {
             m_parentClient->didStartLoading(toDifferentDocument);
             return;
         }
@@ skipping 363 matching lines @@
     // After commit, there is.
     HistoryItem* item = mainFrameLoader.currentItem();
     ASSERT_TRUE(item);
     EXPECT_EQ(WTF::String(url.data()), item->urlString());
 }
 
 class FailCreateChildFrame : public FrameTestHelpers::TestWebFrameClient {
 public:
     FailCreateChildFrame() : m_callCount(0) { }
 
-    WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, const WebString& frameUniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) override
+    WebLocalFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, const WebString& frameUniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties) override
     {
         ++m_callCount;
-        return 0;
+        return nullptr;
     }
 
     int callCount() const { return m_callCount; }
 
 private:
     int m_callCount;
 };
 
 // Test that we don't crash if WebFrameClient::createChildFrame() fails.
 TEST_P(ParameterizedWebFrameTest, CreateChildFrameFailure)
@@ skipping 2691 matching lines @@
     FrameTestHelpers::WebViewHelper helper;
     helper.initializeAndLoad(url, true);
     Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(nullptr);
 
     Document* document = toLocalFrame(helper.webView()->page()->mainFrame())->document();
     EXPECT_TRUE(document->isImageDocument());
     EXPECT_EQ(Resource::DecodeError, toImageDocument(document)->cachedImage()->getStatus());
 }
 
 } // namespace blink