| Index: extensions/browser/test_extensions_browser_client.cc
 | 
| diff --git a/extensions/browser/test_extensions_browser_client.cc b/extensions/browser/test_extensions_browser_client.cc
 | 
| index 33b42e06374c97ac043e700f324ac1fa2927450b..90617f0947b54bdcc13e38af9eb20c8dbc95a58d 100644
 | 
| --- a/extensions/browser/test_extensions_browser_client.cc
 | 
| +++ b/extensions/browser/test_extensions_browser_client.cc
 | 
| @@ -16,9 +16,9 @@ namespace extensions {
 | 
|  TestExtensionsBrowserClient::TestExtensionsBrowserClient(
 | 
|      BrowserContext* main_context)
 | 
|      : main_context_(main_context),
 | 
| -      incognito_context_(NULL),
 | 
| -      process_manager_delegate_(NULL),
 | 
| -      extension_system_factory_(NULL) {
 | 
| +      incognito_context_(nullptr),
 | 
| +      process_manager_delegate_(nullptr),
 | 
| +      extension_system_factory_(nullptr) {
 | 
|    DCHECK(main_context_);
 | 
|    DCHECK(!main_context_->IsOffTheRecord());
 | 
|  }
 | 
| @@ -55,14 +55,14 @@ bool TestExtensionsBrowserClient::IsSameContext(BrowserContext* first,
 | 
|  
 | 
|  bool TestExtensionsBrowserClient::HasOffTheRecordContext(
 | 
|      BrowserContext* context) {
 | 
| -  return context == main_context_ && incognito_context_ != NULL;
 | 
| +  return context == main_context_ && incognito_context_ != nullptr;
 | 
|  }
 | 
|  
 | 
|  BrowserContext* TestExtensionsBrowserClient::GetOffTheRecordContext(
 | 
|      BrowserContext* context) {
 | 
|    if (context == main_context_)
 | 
|      return incognito_context_;
 | 
| -  return NULL;
 | 
| +  return nullptr;
 | 
|  }
 | 
|  
 | 
|  BrowserContext* TestExtensionsBrowserClient::GetOriginalContext(
 | 
| @@ -94,7 +94,7 @@ TestExtensionsBrowserClient::MaybeCreateResourceBundleRequestJob(
 | 
|      const base::FilePath& directory_path,
 | 
|      const std::string& content_security_policy,
 | 
|      bool send_cors_header) {
 | 
| -  return NULL;
 | 
| +  return nullptr;
 | 
|  }
 | 
|  
 | 
|  bool TestExtensionsBrowserClient::AllowCrossRendererResourceLoad(
 | 
| @@ -107,7 +107,7 @@ bool TestExtensionsBrowserClient::AllowCrossRendererResourceLoad(
 | 
|  
 | 
|  PrefService* TestExtensionsBrowserClient::GetPrefServiceForContext(
 | 
|      BrowserContext* context) {
 | 
| -  return NULL;
 | 
| +  return nullptr;
 | 
|  }
 | 
|  
 | 
|  void TestExtensionsBrowserClient::GetEarlyExtensionPrefsObservers(
 | 
| @@ -139,7 +139,7 @@ bool TestExtensionsBrowserClient::IsRunningInForcedAppMode() { return false; }
 | 
|  
 | 
|  ApiActivityMonitor* TestExtensionsBrowserClient::GetApiActivityMonitor(
 | 
|      BrowserContext* context) {
 | 
| -  return NULL;
 | 
| +  return nullptr;
 | 
|  }
 | 
|  
 | 
|  ExtensionSystemProvider*
 | 
| @@ -159,7 +159,7 @@ TestExtensionsBrowserClient::CreateRuntimeAPIDelegate(
 | 
|  
 | 
|  ComponentExtensionResourceManager*
 | 
|  TestExtensionsBrowserClient::GetComponentExtensionResourceManager() {
 | 
| -  return NULL;
 | 
| +  return nullptr;
 | 
|  }
 | 
|  
 | 
|  void TestExtensionsBrowserClient::BroadcastEventToRenderers(
 | 
| @@ -168,7 +168,7 @@ void TestExtensionsBrowserClient::BroadcastEventToRenderers(
 | 
|  }
 | 
|  
 | 
|  net::NetLog* TestExtensionsBrowserClient::GetNetLog() {
 | 
| -  return NULL;
 | 
| +  return nullptr;
 | 
|  }
 | 
|  
 | 
|  }  // namespace extensions
 | 
| 
 |