Updated O3D to work with most recent Chrome base.

Added build.scons for Chrome IPC.
Review URL: http://codereview.chromium.org/160616

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

6 files changed, 41 insertions, 12 deletions

diff --git a/o3d/DEPS b/o3d/DEPS
index 62f20a6..09e5559 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -2,7 +2,7 @@ vars = {
   "chromium_trunk":
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "29",
-  "o3d_code_rev": "109",
+  "o3d_code_rev": "112",
   "skia_rev": "279",
   "gyp_rev": "553",
   "gtest_rev": "267",
diff --git a/o3d/base/build.scons b/o3d/base/build.scons
index 7898600..b75c7a8 100644
--- a/o3d/base/build.scons
+++ b/o3d/base/build.scons
@@ -38,12 +38,16 @@ env.ApplySConscript([
     '$ICU38_DIR/using_icu38.scons',
 ])
 
+# For FRIEND_TEST in gtest_prod.h
+env.Append(CPPPATH = '$GTEST_DIR/include')
+
 chrome_base_inputs = [
   'at_exit',
   'base_paths',
   'base_switches',
   'command_line',
   'debug_util',
+  'dynamic_annotations',
   'file_path',
   'file_util',
   'histogram',
@@ -53,6 +57,7 @@ chrome_base_inputs = [
   'message_loop',
   'message_pump_default',
   'path_service',
+  'pickle',
   'ref_counted',
   'stats_table',
   'string_piece',
diff --git a/o3d/core/cross/types.h b/o3d/core/cross/types.h
index f7b817e..23e6609 100644
--- a/o3d/core/cross/types.h
+++ b/o3d/core/cross/types.h
@@ -105,12 +105,6 @@
 // We can add more sophisticated per-platform #defines as necessary here
 #define IS_LITTLE_ENDIAN 1
 
-#if defined(GYP_BUILD)
-// We only need this in the gyp build because we're using the current
-// chrome/base, which doesn't have down_cast in it anymore.
-// TODO(gspencer): Remove this #ifdef when we are moved fully over to
-// gyp.
-
 // When you upcast (that is, cast a pointer from type Foo to type
 // SuperclassOfFoo), it's fine to use implicit_cast<>, since upcasts
 // always succeed.  When you downcast (that is, cast a pointer from
@@ -137,7 +131,6 @@ inline To down_cast(From* f) {  // Defined as From* so we only accept pointers.
 
   return static_cast<To>(f);
 }
-#endif  // GYP_BUILD
 
 namespace o3d {
 
diff --git a/o3d/ipc/build.scons b/o3d/ipc/build.scons
new file mode 100644
index 0000000..2474cc0
--- /dev/null
+++ b/o3d/ipc/build.scons
@@ -0,0 +1,33 @@
+# Copyright (c) 2006-2008 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.
+
+__doc__ = """
+Master configuration for building ipc component.
+"""
+
+Import('env')
+
+inputs = [
+    'ipc_channel_proxy',
+    'ipc_logging',
+    'ipc_message',
+    'ipc_message_utils',
+    'ipc_switches',
+    'ipc_sync_channel',
+    'ipc_sync_message',
+]
+
+if env.Bit('windows'):
+  inputs += [
+      'ipc_channel_win',
+  ]
+
+if env.Bit('mac') or env.Bit('linux'):
+  inputs += [
+      'file_descriptor_set_posix',
+      'ipc_channel_posix',
+  ]
+
+input_files = env.MakeObjects(inputs, '$CHROME_SRC_DIR/ipc', 'cc')
+env.ComponentLibrary('o3d_ipc', input_files)
diff --git a/o3d/main.scons b/o3d/main.scons
index ddfd819..3f2ce28 100644
--- a/o3d/main.scons
+++ b/o3d/main.scons
@@ -181,6 +181,7 @@ binaries_env.Append(
         'converter',
         'core',
         'import',
+        'ipc',
         'plugin',
         'samples',
         'serializer',
@@ -346,6 +347,7 @@ windows_env.Append(
         'psapi',
         'winmm',  # For V8
         'ws2_32', # For V8
+        'Dbghelp', # For Chrome base
     ],
     BUILD_COMPONENTS = [
         'breakpad',
diff --git a/o3d/utils/cross/file_path_utils.cc b/o3d/utils/cross/file_path_utils.cc
index d62c417..bea30de 100644
--- a/o3d/utils/cross/file_path_utils.cc
+++ b/o3d/utils/cross/file_path_utils.cc
@@ -173,11 +173,7 @@ bool FindFileHelper(const FilePath& path_to_search,
                     const FilePath& path_to_find,
                     FilePath* found_path) {
   std::vector<FilePath::StringType> parts;
-#ifdef GYP_BUILD
   path_to_find.GetComponents(&parts);
-#else
-  file_util::PathComponents(path_to_find, &parts);
-#endif
 
   for (size_t ii = 0; ii < parts.size(); ++ii) {
     // build a path from parts.