Index: chrome/browser/ui/libgtk2ui/gtk2_util.cc |
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_util.cc b/chrome/browser/ui/libgtk2ui/gtk2_util.cc |
index cd72e9841b4c014cc45a1153eb6382e12d684163..6aceaf3e6180557664e93f63db715b2f34b6d1d2 100644 |
--- a/chrome/browser/ui/libgtk2ui/gtk2_util.cc |
+++ b/chrome/browser/ui/libgtk2ui/gtk2_util.cc |
@@ -9,10 +9,11 @@ |
#include <gtk/gtk.h> |
#include <stddef.h> |
+#include <memory> |
+ |
#include "base/command_line.h" |
#include "base/debug/leak_annotations.h" |
#include "base/environment.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/aura/window.h" |
#include "ui/aura/window_tree_host.h" |
#include "ui/base/accelerators/accelerator.h" |
@@ -28,7 +29,7 @@ void CommonInitFromCommandLine(const base::CommandLine& command_line, |
void (*init_func)(gint*, gchar***)) { |
const std::vector<std::string>& args = command_line.argv(); |
int argc = args.size(); |
- scoped_ptr<char *[]> argv(new char *[argc + 1]); |
+ std::unique_ptr<char* []> argv(new char*[argc + 1]); |
for (size_t i = 0; i < args.size(); ++i) { |
// TODO(piman@google.com): can gtk_init modify argv? Just being safe |
// here. |