This updated the GYP deps file to the last known good revision of Chrome,

and all the associated third party packages.

Review URL: http://codereview.chromium.org/203077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26283 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 17 deletions

diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 2ed3f69..e792fab 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -1,15 +1,15 @@
 vars = {
   "chromium_trunk": "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "54",
-  "chromium_rev": "22547",
+  "chromium_rev": "26261",
   "o3d_code_rev": "145",
-  "skia_rev": "279",
-  "gyp_rev": "626",
+  "skia_rev": "341",
+  "gyp_rev": "651",
   "gtest_rev": "267",
   "gflags_rev": "30",
-  "breakpad_rev": "346",
-  "v8_rev": "2624",
-  "icu38_rev": "20192",
+  "breakpad_rev": "391",
+  "v8_rev": "2866",
+  "icu_rev": "25717",
   "nacl_rev": "569",
 }
 
@@ -52,14 +52,11 @@ deps = {
 
 # Stuff from the Chromium tree.
 
-  "third_party/boost":
-    Var("chromium_trunk") + "/src/third_party/boost@" + Var("chromium_rev"),
-
   "third_party/harfbuzz":
     Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"),
 
-  "third_party/icu38":
-    Var("chromium_trunk") + "/deps/third_party/icu38@" + Var("icu38_rev"),
+  "third_party/icu":
+    Var("chromium_trunk") + "/deps/third_party/icu42@" + Var("icu_rev"),
 
   "third_party/libevent":
     Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
@@ -70,6 +67,9 @@ deps = {
   "third_party/libpng":
     Var("chromium_trunk") + "/src/third_party/libpng@" + Var("chromium_rev"),
 
+  "chrome/third_party/wtl":
+    Var("chromium_trunk") + "/src/chrome/third_party/wtl@" + Var("chromium_rev"),
+
   "third_party/zlib":
     Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"),
 
diff --git a/o3d/core/win/d3d9/utils_d3d9.h b/o3d/core/win/d3d9/utils_d3d9.h
index 03d4ca5..6e1cd20 100644
--- a/o3d/core/win/d3d9/utils_d3d9.h
+++ b/o3d/core/win/d3d9/utils_d3d9.h
@@ -37,7 +37,7 @@
 #define O3D_CORE_WIN_D3D9_UTILS_D3D9_H_
 
 #include <d3d9.h>
-#include <dxerr.h>
+#include <DxErr.h>
 #include "base/logging.h"
 #include "core/cross/stream.h"
 
diff --git a/o3d/utils/cross/temporary_file.cc b/o3d/utils/cross/temporary_file.cc
index afb4b61..0bb010b 100644
--- a/o3d/utils/cross/temporary_file.cc
+++ b/o3d/utils/cross/temporary_file.cc
@@ -57,7 +57,7 @@ TemporaryFile::TemporaryFile(const FilePath& file_to_manage)
 
 bool TemporaryFile::Create(TemporaryFile* temporary_file) {
   FilePath temporary_path;
-  if (file_util::CreateTemporaryFileName(&temporary_path)) {
+  if (file_util::CreateTemporaryFile(&temporary_path)) {
     temporary_file->Reset(temporary_path);
   } else {
     return false;
diff --git a/o3d/utils/cross/temporary_file_test.cc b/o3d/utils/cross/temporary_file_test.cc
index bdbe492..07cadb4 100644
--- a/o3d/utils/cross/temporary_file_test.cc
+++ b/o3d/utils/cross/temporary_file_test.cc
@@ -50,7 +50,7 @@ TEST_F(TemporaryFileTest, BasicConstruction) {
 
 TEST_F(TemporaryFileTest, BasicFunction) {
   FilePath path;
-  file_util::CreateTemporaryFileName(&path);
+  file_util::CreateTemporaryFile(&path);
   EXPECT_TRUE(file_util::PathExists(path));
   {
     TemporaryFile temporary_file(path);
@@ -64,8 +64,8 @@ TEST_F(TemporaryFileTest, BasicFunction) {
 TEST_F(TemporaryFileTest, Reset) {
   FilePath path;
   FilePath path1;
-  file_util::CreateTemporaryFileName(&path);
-  file_util::CreateTemporaryFileName(&path1);
+  file_util::CreateTemporaryFile(&path);
+  file_util::CreateTemporaryFile(&path1);
   EXPECT_TRUE(file_util::PathExists(path));
   EXPECT_TRUE(file_util::PathExists(path1));
   {
@@ -86,7 +86,7 @@ TEST_F(TemporaryFileTest, Reset) {
 
 TEST_F(TemporaryFileTest, Release) {
   FilePath path;
-  file_util::CreateTemporaryFileName(&path);
+  file_util::CreateTemporaryFile(&path);
   EXPECT_TRUE(file_util::PathExists(path));
   {
     TemporaryFile temporary_file(path);