Revert "Add a new app API to enable watchdog behavior restarts in kiosk apps"

extensions/browser/test_extensions_browser_client.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 "extensions/browser/test_extensions_browser_client.h"
 
 #include "base/values.h"
 #include "build/build_config.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/extension_host_delegate.h"
@@ skipping 104 matching lines @@
 bool TestExtensionsBrowserClient::AllowCrossRendererResourceLoad(
     net::URLRequest* request,
     bool is_incognito,
     const Extension* extension,
     InfoMap* extension_info_map) {
   return false;
 }
 
 PrefService* TestExtensionsBrowserClient::GetPrefServiceForContext(
     BrowserContext* context) {
-  return nullptr;
+  return NULL;
 }
 
 void TestExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
     content::BrowserContext* context,
     std::vector<ExtensionPrefsObserver*>* observers) const {}
 
 ProcessManagerDelegate* TestExtensionsBrowserClient::GetProcessManagerDelegate()
     const {
   return process_manager_delegate_;
 }
@@ skipping 76 matching lines @@
 
 scoped_refptr<update_client::UpdateClient>
 TestExtensionsBrowserClient::CreateUpdateClient(
     content::BrowserContext* context) {
   return update_client_factory_.is_null()
              ? nullptr
              : make_scoped_refptr(update_client_factory_.Run());
 }
 
 }  // namespace extensions