more changes

content/browser/gpu/gpu_data_manager.cc

 // Copyright (c) 2011 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/browser/gpu/gpu_data_manager.h"
 
 #if defined(OS_MACOSX)
 #include <CoreGraphics/CGDisplayConfiguration.h>
 #endif
 
@@ skipping 302 matching lines @@
                                              gpu_info().gl_extensions));
 
   DictionaryValue* info = new DictionaryValue();
   info->Set("basic_info", basic_info);
 
 #if defined(OS_WIN)
   Value* dx_info;
   if (gpu_info().dx_diagnostics.children.size())
     dx_info = DxDiagNodeToList(gpu_info().dx_diagnostics);
   else
-    dx_info = Value::CreateNullValue();
+    dx_info = base::NullValue();
   info->Set("diagnostics", dx_info);
 #endif
 
   return info;
 }
 
 void GpuDataManager::RunGpuInfoUpdateCallbacks() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this, &GpuDataManager::RunGpuInfoUpdateCallbacks));
@@ skipping 53 matching lines @@
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
       browser_command_line.GetSwitchValueASCII(
           switches::kUseGL) == gfx::kGLImplementationOSMesaName)
     return NULL;
   // No need to return an empty blacklist.
   if (gpu_blacklist_.get() != NULL && gpu_blacklist_->max_entry_id() == 0)
     return NULL;
   return gpu_blacklist_.get();
 }