commit d903c3b0507a433ec25675ed6dc68ce8551127c7
author Chris Masone <cmasone@chromium.org> Thu May 12 15:35:46 2011 -0700
committer Chris Masone <cmasone@chromium.org> Sat May 14 11:10:05 2011 -0700
tree 4b79c38e8701a80e76d318fcbf96e4319924415d
parent 265f290d2be0a68b6266d5962f7c23290c0ced5f

[update_engine] Roll forward to new libchrome

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

Change-Id: Ic6bc4c27ade8f960b770cd766753d6e5729d4878
Reviewed-on: http://gerrit.chromium.org/gerrit/823
Reviewed-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

chrome_proxy_resolver.cc

diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index 1deab11..7d3676b 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -5,7 +5,7 @@
 #include "update_engine/chrome_proxy_resolver.h"
 
 #include <base/json/json_reader.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
 #include <base/values.h>
 
 #include "update_engine/utils.h"