Make sure that s_platform is non-null

third_party/WebKit/Source/platform/exported/Platform.cpp

 /*
  * Copyright (C) 2012 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 41 matching lines @@
 
 } // namespace
 
 Platform::Platform()
     : m_mainThread(0)
 {
 }
 
 void Platform::initialize(Platform* platform)
 {
+    ASSERT(platform);
     s_platform = platform;
-    if (s_platform)
-        s_platform->m_mainThread = platform->currentThread();
+    s_platform->m_mainThread = platform->currentThread();
 
     // TODO(ssid): remove this check after fixing crbug.com/486782.
-    if (s_platform && s_platform->m_mainThread)
+    if (s_platform->m_mainThread)
         s_platform->registerMemoryDumpProvider(PartitionAllocMemoryDumpProvider::instance(), "PartitionAlloc");
 
     CompositorFactory::initializeDefault();
 }
 
 void Platform::shutdown()
 {
     CompositorFactory::shutdown();
 
     if (s_platform->m_mainThread)
         s_platform->unregisterMemoryDumpProvider(PartitionAllocMemoryDumpProvider::instance());
 
-    if (s_platform)
-        s_platform->m_mainThread = 0;
-    s_platform = 0;
+    s_platform->m_mainThread = nullptr;
+    s_platform = nullptr;
 }
 
 void Platform::setCurrentPlatformForTesting(Platform* platform)
 {
+    ASSERT(platform);
     s_platform = platform;
-    if (s_platform)
-        s_platform->m_mainThread = platform->currentThread();
+    s_platform->m_mainThread = platform->currentThread();
 }
 
 Platform* Platform::current()
 {
     return s_platform;
 }
 
 WebThread* Platform::mainThread() const
 {
     return m_mainThread;
@@ skipping 14 matching lines @@
     ProviderToAdapterMap::iterator it = memoryDumpProviders().find(provider);
     if (it == memoryDumpProviders().end())
         return;
     WebMemoryDumpProviderAdapter* adapter = it->value.get();
     base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(adapter);
     adapter->set_is_registered(false);
     memoryDumpProviders().remove(it);
 }
 
 } // namespace blink