commit fcd73d47301edc265c18f593befae218a53ba1b6
author Chris Masone <cmasone@chromium.org> Thu May 12 11:10:55 2011 -0700
committer Chris Masone <cmasone@chromium.org> Sat May 14 11:09:42 2011 -0700
tree 75252312b9474250ed3dcf168959adb50e0db7c3
parent 4463bea3bfd0283fe62fd8d10d1b581dd1719156

[minijail] Roll forward to new libchrome

BUG=chromium-os:14304
TEST=build, unit tests

Change-Id: I9811e51183de0d5699a7a0b3443fa1028c9f4d74
Reviewed-on: http://gerrit.chromium.org/gerrit/820
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

env.h

diff --git a/env.h b/env.h
index 18cde8a..d98cee3 100644
--- a/env.h
+++ b/env.h
@@ -11,7 +11,7 @@
 #define __CHROMEOS_MINIJAIL_ENV_H
 
 #include <base/basictypes.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 
 namespace chromeos {
 namespace minijail {

interface.h

diff --git a/interface.h b/interface.h
index d4d108b..4465e9c 100644
--- a/interface.h
+++ b/interface.h
@@ -9,7 +9,7 @@
 #define __CHROMEOS_MINIJAIL_INTERFACE_H
 
 #include <base/basictypes.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 
 namespace chromeos {
 namespace minijail {

minijail.h

diff --git a/minijail.h b/minijail.h
index e489018..7a556fb 100644
--- a/minijail.h
+++ b/minijail.h
@@ -14,7 +14,7 @@
 
 #include <base/basictypes.h>
 #include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 
 #include "minijail/env.h"
 #include "minijail/options.h"

minijail_main.cc

diff --git a/minijail_main.cc b/minijail_main.cc
index 69a854d..ab8bf27 100644
--- a/minijail_main.cc
+++ b/minijail_main.cc
@@ -150,7 +150,8 @@
   logging::InitLogging(NULL,
                        logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
                        logging::DONT_LOCK_LOG_FILE,
-                       logging::APPEND_TO_OLD_LOG_FILE);
+                       logging::APPEND_TO_OLD_LOG_FILE,
+                       logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
 
   chromeos::MiniJailOptions jail_opts;
   CommandLine *cl = CommandLine::ForCurrentProcess();

options.cc

diff --git a/options.cc b/options.cc
index 78b6df3..cf71cfe 100644
--- a/options.cc
+++ b/options.cc
@@ -9,7 +9,7 @@
 
 #include <base/basictypes.h>
 #include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 
 namespace chromeos {
 

options.h

diff --git a/options.h b/options.h
index 3d75593..f9885d7 100644
--- a/options.h
+++ b/options.h
@@ -9,7 +9,7 @@
 
 #include <base/basictypes.h>
 #include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 
 #include "minijail/env.h"