Revert of Stop passing raw pointers to base::Value API in c/b/ui

chrome/browser/ui/webui/flash_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/flash_ui.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 224 matching lines @@
       !has_plugin_info_) {
     return;
   }
 
   timeout_.Stop();
 
   // This is code that runs only when the user types in about:flash. We don't
   // need to jump through hoops to offload this to the IO thread.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  auto list = base::MakeUnique<base::ListValue>();
+  base::ListValue* list = new base::ListValue();
 
   // Chrome version information.
-  AddPair(list.get(), l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-          version_info::GetVersionNumber() + " (" + chrome::GetChannelString() +
-              ")");
+  AddPair(list,
+          l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+          version_info::GetVersionNumber() + " (" +
+          chrome::GetChannelString() + ")");
 
   // OS version information.
   std::string os_label = version_info::GetOSType();
 #if defined(OS_WIN)
   base::win::OSInfo* os = base::win::OSInfo::GetInstance();
   switch (os->version()) {
     case base::win::VERSION_XP: os_label += " XP"; break;
     case base::win::VERSION_SERVER_2003:
       os_label += " Server 2003 or XP Pro 64 bit";
       break;
     case base::win::VERSION_VISTA: os_label += " Vista or Server 2008"; break;
     case base::win::VERSION_WIN7: os_label += " 7 or Server 2008 R2"; break;
     case base::win::VERSION_WIN8: os_label += " 8 or Server 2012"; break;
     default:  os_label += " UNKNOWN"; break;
   }
   os_label += " SP" + base::IntToString(os->service_pack().major);
   if (os->service_pack().minor > 0)
     os_label += "." + base::IntToString(os->service_pack().minor);
   if (os->architecture() == base::win::OSInfo::X64_ARCHITECTURE)
     os_label += " 64 bit";
 #endif
-  AddPair(list.get(), l10n_util::GetStringUTF16(IDS_VERSION_UI_OS), os_label);
+  AddPair(list, l10n_util::GetStringUTF16(IDS_VERSION_UI_OS), os_label);
 
   // Obtain the version of the Flash plugins.
   std::vector<content::WebPluginInfo> info_array;
   PluginService::GetInstance()->GetPluginInfoArray(
       GURL(), content::kFlashPluginSwfMimeType, false, &info_array, NULL);
   if (info_array.empty()) {
-    AddPair(list.get(), ASCIIToUTF16(kFlashPlugin), "Not installed");
+    AddPair(list, ASCIIToUTF16(kFlashPlugin), "Not installed");
   } else {
     PluginPrefs* plugin_prefs =
         PluginPrefs::GetForProfile(Profile::FromWebUI(web_ui())).get();
     bool found_enabled = false;
     for (size_t i = 0; i < info_array.size(); ++i) {
       base::string16 flash_version = info_array[i].version + ASCIIToUTF16(" ") +
                                info_array[i].path.LossyDisplayName();
       if (plugin_prefs->IsPluginEnabled(info_array[i])) {
         // If we have already found an enabled Flash version, this one
         // is not used.
         if (found_enabled)
           flash_version += ASCIIToUTF16(" (not used)");
 
         found_enabled = true;
       } else {
         flash_version += ASCIIToUTF16(" (disabled)");
       }
-      AddPair(list.get(), ASCIIToUTF16(kFlashPlugin), flash_version);
+      AddPair(list, ASCIIToUTF16(kFlashPlugin), flash_version);
     }
   }
 
   // Crash information.
-  AddPair(list.get(), base::string16(), "--- Crash data ---");
+  AddPair(list, base::string16(), "--- Crash data ---");
   bool crash_reporting_enabled =
       ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
   if (crash_reporting_enabled) {
     std::vector<CrashUploadList::UploadInfo> crashes;
     upload_list_->GetUploads(10, &crashes);
 
     for (std::vector<CrashUploadList::UploadInfo>::iterator i = crashes.begin();
          i != crashes.end(); ++i) {
       base::string16 crash_string(ASCIIToUTF16(i->upload_id));
       crash_string += ASCIIToUTF16(" ");
       crash_string += base::TimeFormatFriendlyDateAndTime(i->upload_time);
-      AddPair(list.get(), ASCIIToUTF16("crash id"), crash_string);
+      AddPair(list, ASCIIToUTF16("crash id"), crash_string);
     }
   } else {
-    AddPair(list.get(), ASCIIToUTF16("Crash Reporting"),
-            "Enable crash reporting to see crash IDs");
-    AddPair(list.get(), ASCIIToUTF16("For more details"),
-            chrome::kLearnMoreReportingURL);
+    AddPair(list, ASCIIToUTF16("Crash Reporting"),
+                  "Enable crash reporting to see crash IDs");
+    AddPair(list, ASCIIToUTF16("For more details"),
+                  chrome::kLearnMoreReportingURL);
   }
 
   // GPU information.
-  AddPair(list.get(), base::string16(), "--- GPU information ---");
+  AddPair(list, base::string16(), "--- GPU information ---");
   gpu::GPUInfo gpu_info = GpuDataManager::GetInstance()->GetGPUInfo();
 
   std::string reason;
   if (!GpuDataManager::GetInstance()->GpuAccessAllowed(&reason)) {
-    AddPair(list.get(), ASCIIToUTF16("WARNING:"),
+    AddPair(list, ASCIIToUTF16("WARNING:"),
             "GPU access is not allowed: " + reason);
   }
 #if defined(OS_WIN)
   const gpu::DxDiagNode& node = gpu_info.dx_diagnostics;
   for (std::map<std::string, gpu::DxDiagNode>::const_iterator it =
            node.children.begin();
        it != node.children.end();
        ++it) {
     for (std::map<std::string, std::string>::const_iterator it2 =
              it->second.values.begin();
          it2 != it->second.values.end();
          ++it2) {
       if (!it2->second.empty()) {
         if (it2->first == "szDescription") {
-          AddPair(list.get(), ASCIIToUTF16("Graphics card"), it2->second);
+          AddPair(list, ASCIIToUTF16("Graphics card"), it2->second);
         } else if (it2->first == "szDriverNodeStrongName") {
-          AddPair(list.get(), ASCIIToUTF16("Driver name (strong)"),
-                  it2->second);
+          AddPair(list, ASCIIToUTF16("Driver name (strong)"), it2->second);
         } else if (it2->first == "szDriverName") {
-          AddPair(list.get(), ASCIIToUTF16("Driver display name"), it2->second);
+          AddPair(list, ASCIIToUTF16("Driver display name"), it2->second);
         }
       }
     }
   }
 #endif
 
-  AddPair(list.get(), base::string16(), "--- GPU driver, more information ---");
-  AddPair(list.get(), ASCIIToUTF16("Vendor Id"),
+  AddPair(list, base::string16(), "--- GPU driver, more information ---");
+  AddPair(list,
+          ASCIIToUTF16("Vendor Id"),
           base::StringPrintf("0x%04x", gpu_info.gpu.vendor_id));
-  AddPair(list.get(), ASCIIToUTF16("Device Id"),
+  AddPair(list,
+          ASCIIToUTF16("Device Id"),
           base::StringPrintf("0x%04x", gpu_info.gpu.device_id));
-  AddPair(list.get(), ASCIIToUTF16("Driver vendor"), gpu_info.driver_vendor);
-  AddPair(list.get(), ASCIIToUTF16("Driver version"), gpu_info.driver_version);
-  AddPair(list.get(), ASCIIToUTF16("Driver date"), gpu_info.driver_date);
-  AddPair(list.get(), ASCIIToUTF16("Pixel shader version"),
+  AddPair(list, ASCIIToUTF16("Driver vendor"), gpu_info.driver_vendor);
+  AddPair(list, ASCIIToUTF16("Driver version"), gpu_info.driver_version);
+  AddPair(list, ASCIIToUTF16("Driver date"), gpu_info.driver_date);
+  AddPair(list,
+          ASCIIToUTF16("Pixel shader version"),
           gpu_info.pixel_shader_version);
-  AddPair(list.get(), ASCIIToUTF16("Vertex shader version"),
+  AddPair(list,
+          ASCIIToUTF16("Vertex shader version"),
           gpu_info.vertex_shader_version);
-  AddPair(list.get(), ASCIIToUTF16("GL_VENDOR"), gpu_info.gl_vendor);
-  AddPair(list.get(), ASCIIToUTF16("GL_RENDERER"), gpu_info.gl_renderer);
-  AddPair(list.get(), ASCIIToUTF16("GL_VERSION"), gpu_info.gl_version);
-  AddPair(list.get(), ASCIIToUTF16("GL_EXTENSIONS"), gpu_info.gl_extensions);
+  AddPair(list, ASCIIToUTF16("GL_VENDOR"), gpu_info.gl_vendor);
+  AddPair(list, ASCIIToUTF16("GL_RENDERER"), gpu_info.gl_renderer);
+  AddPair(list, ASCIIToUTF16("GL_VERSION"), gpu_info.gl_version);
+  AddPair(list, ASCIIToUTF16("GL_EXTENSIONS"), gpu_info.gl_extensions);
 
   base::DictionaryValue flashInfo;
-  flashInfo.Set("flashInfo", std::move(list));
+  flashInfo.Set("flashInfo", list);
   web_ui()->CallJavascriptFunctionUnsafe("returnFlashInfo", flashInfo);
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // FlashUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 FlashUI::FlashUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   base::RecordAction(UserMetricsAction("ViewAboutFlash"));
 
   web_ui->AddMessageHandler(base::MakeUnique<FlashDOMHandler>());
 
   // Set up the about:flash source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateFlashUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* FlashUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   // Use the default icon for now.
   return NULL;
 }