Eliminate use of PPB_URLUtil_Dev in NaCl build of Proxy.

BUG=116317
TEST=compiles and links without errors
Review URL: https://chromiumcodereview.appspot.com/9561001

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

5 files changed, 68 insertions, 374 deletions

diff --git a/ppapi/ppapi_proxy_untrusted.gyp b/ppapi/ppapi_proxy_untrusted.gyp
index ecbdc27..74785d2 100644
--- a/ppapi/ppapi_proxy_untrusted.gyp
+++ b/ppapi/ppapi_proxy_untrusted.gyp
@@ -43,7 +43,7 @@
           '../base/debug/trace_event_impl.cc',
 #          '../base/environment.cc',
           '../base/file_path.cc',
-#          '../base/file_util.cc', #ftruncate 234
+#          '../base/file_util.cc',
 #          '../base/file_util_posix.cc',
 #          '../base/file_util_proxy.cc',
           '../base/files/file_path_watcher.cc',
@@ -235,10 +235,6 @@
         'build_newlib': 1,
         'include_dirs': [
           '..',
-#          '../third_party/icu/public/common',
-#          '../third_party/icu/public/i18n',
-#          '../third_party/icu/source/common',
-#          '../third_party/icu/source/i18n',
           '../third_party/khronos',
           '../third_party/skia/include/config',
         ],
@@ -257,18 +253,18 @@
           'shared_impl/ppb_device_ref_shared.cc',
           'shared_impl/ppb_file_io_shared.cc',
           'shared_impl/ppb_file_ref_shared.cc',
-          'shared_impl/ppb_graphics_3d_shared.cc',
-#          'shared_impl/ppb_image_data_shared.cc',
+#          'shared_impl/ppb_graphics_3d_shared.cc',
+          'shared_impl/ppb_image_data_shared.cc',
           'shared_impl/ppb_input_event_shared.cc',
           'shared_impl/ppb_instance_shared.cc',
           'shared_impl/ppb_memory_shared.cc',
-          'shared_impl/ppb_opengles2_shared.cc',
+#          'shared_impl/ppb_opengles2_shared.cc',
           'shared_impl/ppb_resource_array_shared.cc',
           'shared_impl/ppb_url_request_info_shared.cc',
 #          'shared_impl/ppb_url_util_shared.cc',
           'shared_impl/ppb_var_shared.cc',
-          'shared_impl/ppb_video_decoder_shared.cc',
-          'shared_impl/ppb_video_capture_shared.cc',
+#          'shared_impl/ppb_video_decoder_shared.cc',
+#          'shared_impl/ppb_video_capture_shared.cc',
           'shared_impl/ppb_view_shared.cc',
           'shared_impl/ppp_instance_combined.cc',
           'shared_impl/proxy_lock.cc',
@@ -287,7 +283,7 @@
           'thunk/ppb_audio_thunk.cc',
           'thunk/ppb_audio_trusted_thunk.cc',
           'thunk/ppb_broker_thunk.cc',
-          'thunk/ppb_browser_font_trusted_thunk.cc',
+#          'thunk/ppb_browser_font_trusted_thunk.cc',
           'thunk/ppb_buffer_thunk.cc',
           'thunk/ppb_buffer_trusted_thunk.cc',
 #          'thunk/ppb_char_set_thunk.cc',
@@ -302,16 +298,17 @@
           'thunk/ppb_file_ref_thunk.cc',
           'thunk/ppb_file_system_thunk.cc',
           'thunk/ppb_find_thunk.cc',
-          'thunk/ppb_flash_clipboard_thunk.cc',
-          'thunk/ppb_flash_fullscreen_thunk.cc',
-          'thunk/ppb_flash_menu_thunk.cc',
-          'thunk/ppb_flash_message_loop_thunk.cc',
+#          'thunk/ppb_flash_clipboard_thunk.cc',
+#          'thunk/ppb_flash_fullscreen_thunk.cc',
+#          'thunk/ppb_flash_menu_thunk.cc',
+#          'thunk/ppb_flash_message_loop_thunk.cc',
           'thunk/ppb_fullscreen_thunk.cc',
           'thunk/ppb_gamepad_thunk.cc',
-          'thunk/ppb_gles_chromium_texture_mapping_thunk.cc',
-          'thunk/ppb_graphics_2d_thunk.cc',
-          'thunk/ppb_graphics_3d_thunk.cc',
-          'thunk/ppb_graphics_3d_trusted_thunk.cc',
+#          'thunk/ppb_gles_chromium_texture_mapping_thunk.cc',
+#          'thunk/ppb_graphics_2d_thunk.cc',
+#          'thunk/ppb_graphics_3d_thunk.cc',
+#          'thunk/ppb_graphics_3d_trusted_thunk.cc',
+#          'thunk/ppb_host_resolver_private_thunk.cc',
 #          'thunk/ppb_image_data_thunk.cc',
 #          'thunk/ppb_image_data_trusted_thunk.cc',
           'thunk/ppb_instance_thunk.cc',
@@ -320,6 +317,7 @@
           'thunk/ppb_mouse_lock_thunk.cc',
           'thunk/ppb_resource_array_thunk.cc',
           'thunk/ppb_scrollbar_thunk.cc',
+          'thunk/ppb_talk_private_thunk.cc',
 #          'thunk/ppb_tcp_server_socket_private_thunk.cc',
 #          'thunk/ppb_tcp_socket_private_thunk.cc',
           'thunk/ppb_text_input_thunk.cc',
@@ -329,13 +327,13 @@
           'thunk/ppb_url_request_info_thunk.cc',
           'thunk/ppb_url_response_info_thunk.cc',
 #          'thunk/ppb_url_util_thunk.cc',
-          'thunk/ppb_video_capture_thunk.cc',
-          'thunk/ppb_video_decoder_thunk.cc',
-          'thunk/ppb_video_layer_thunk.cc',
+#          'thunk/ppb_video_capture_thunk.cc',
+#          'thunk/ppb_video_decoder_thunk.cc',
+#          'thunk/ppb_video_layer_thunk.cc',
           'thunk/ppb_view_thunk.cc',
           'thunk/ppb_websocket_thunk.cc',
           'thunk/ppb_widget_thunk.cc',
-          'thunk/ppb_x509_certificate_private_thunk.cc',
+#          'thunk/ppb_x509_certificate_private_thunk.cc',
           'thunk/ppb_zoom_thunk.cc',
 
           'proxy/broker_dispatcher.cc',
@@ -358,34 +356,39 @@
           'proxy/ppb_broker_proxy.cc',
           'proxy/ppb_buffer_proxy.cc',
           'proxy/ppb_core_proxy.cc',
-          'proxy/ppb_cursor_control_proxy.cc',
-          'proxy/ppb_file_chooser_proxy.cc',
+#          'proxy/ppb_file_chooser_proxy.cc',
           'proxy/ppb_file_io_proxy.cc',
           'proxy/ppb_file_ref_proxy.cc',
           'proxy/ppb_file_system_proxy.cc',
-          'proxy/ppb_graphics_2d_proxy.cc',
-          'proxy/ppb_graphics_3d_proxy.cc',
-#          'proxy/ppb_image_data_proxy.cc',
+#          'proxy/ppb_graphics_2d_proxy.cc',
+#          'proxy/ppb_graphics_3d_proxy.cc',
+          'proxy/ppb_host_resolver_private_proxy.cc',
+          'proxy/ppb_image_data_proxy.cc',
           'proxy/ppb_instance_proxy.cc',
           'proxy/ppb_message_loop_proxy.cc',
-          'proxy/ppb_pdf_proxy.cc',
+#          'proxy/ppb_network_monitor_private_proxy.cc',
+#          'proxy/ppb_pdf_proxy.cc',
+          'proxy/ppb_talk_private_proxy.cc',
+#          'proxy/ppb_tcp_server_socket_private_proxy.cc',
 #          'proxy/ppb_tcp_socket_private_proxy.cc',
-          'proxy/ppb_testing_proxy.cc',
+#          'proxy/ppb_testing_proxy.cc',
           'proxy/ppb_text_input_proxy.cc',
 #          'proxy/ppb_udp_socket_private_proxy.cc',
           'proxy/ppb_url_loader_proxy.cc',
           'proxy/ppb_url_response_info_proxy.cc',
           'proxy/ppb_var_deprecated_proxy.cc',
-          'proxy/ppb_video_capture_proxy.cc',
-          'proxy/ppb_video_decoder_proxy.cc',
+#          'proxy/ppb_video_capture_proxy.cc',
+#          'proxy/ppb_video_decoder_proxy.cc',
           'proxy/ppp_class_proxy.cc',
-          'proxy/ppp_graphics_3d_proxy.cc',
+#          'proxy/ppp_graphics_3d_proxy.cc',
           'proxy/ppp_input_event_proxy.cc',
-          'proxy/ppp_instance_private_proxy.cc',
+#          'proxy/ppp_instance_private_proxy.cc',
           'proxy/ppp_instance_proxy.cc',
           'proxy/ppp_messaging_proxy.cc',
           'proxy/ppp_mouse_lock_proxy.cc',
-          'proxy/ppp_video_decoder_proxy.cc',
+          'proxy/ppp_printing_proxy.cc',
+          'proxy/ppp_text_input_proxy.cc',
+#          'proxy/ppp_video_decoder_proxy.cc',
           'proxy/proxy_channel.cc',
           'proxy/proxy_module.cc',
           'proxy/proxy_object_var.cc',
@@ -405,327 +408,6 @@
           '-lipc_untrusted',
           '-lbase_untrusted',
         ],
-        'other_sources': [
-          '../googleurl/src/gurl.cc',
-          '../googleurl/src/url_canon_etc.cc',
-          '../googleurl/src/url_canon_fileurl.cc',
-          '../googleurl/src/url_canon_host.cc',
-          '../googleurl/src/url_canon_icu.cc',
-          '../googleurl/src/url_canon_internal.cc',
-          '../googleurl/src/url_canon_ip.cc',
-          '../googleurl/src/url_canon_mailtourl.cc',
-          '../googleurl/src/url_canon_path.cc',
-          '../googleurl/src/url_canon_pathurl.cc',
-          '../googleurl/src/url_canon_query.cc',
-          '../googleurl/src/url_canon_relative.cc',
-          '../googleurl/src/url_canon_stdurl.cc',
-          '../googleurl/src/url_parse.cc',
-          '../googleurl/src/url_parse_file.cc',
-          '../googleurl/src/url_util.cc',
-
-          '../third_party/icu/source/common/bmpset.cpp',
-          '../third_party/icu/source/common/brkeng.cpp',
-          '../third_party/icu/source/common/brkiter.cpp',
-          '../third_party/icu/source/common/bytestream.cpp',
-          '../third_party/icu/source/common/caniter.cpp',
-          '../third_party/icu/source/common/chariter.cpp',
-          '../third_party/icu/source/common/charstr.cpp',
-          '../third_party/icu/source/common/cmemory.c',
-          '../third_party/icu/source/common/cstring.c',
-          '../third_party/icu/source/common/cwchar.c',
-          '../third_party/icu/source/common/dictbe.cpp',
-          '../third_party/icu/source/common/dtintrv.cpp',
-          '../third_party/icu/source/common/errorcode.cpp',
-          '../third_party/icu/source/common/filterednormalizer2.cpp',
-          '../third_party/icu/source/common/icudataver.c',
-          '../third_party/icu/source/common/icuplug.c',
-          '../third_party/icu/source/common/locavailable.cpp',
-          '../third_party/icu/source/common/locbased.cpp',
-          '../third_party/icu/source/common/locdispnames.cpp',
-          '../third_party/icu/source/common/locid.cpp',
-          '../third_party/icu/source/common/loclikely.cpp',
-          '../third_party/icu/source/common/locmap.c',
-          '../third_party/icu/source/common/locresdata.cpp',
-          '../third_party/icu/source/common/locutil.cpp',
-          '../third_party/icu/source/common/mutex.cpp',
-          '../third_party/icu/source/common/normalizer2.cpp',
-          '../third_party/icu/source/common/normalizer2impl.cpp',
-          '../third_party/icu/source/common/normlzr.cpp',
-          '../third_party/icu/source/common/parsepos.cpp',
-          '../third_party/icu/source/common/propname.cpp',
-          '../third_party/icu/source/common/propsvec.c',
-          '../third_party/icu/source/common/punycode.c',
-#          '../third_party/icu/source/common/putil.c', # __timezone undefined
-          '../third_party/icu/source/common/rbbi.cpp',
-          '../third_party/icu/source/common/rbbidata.cpp',
-          '../third_party/icu/source/common/rbbinode.cpp',
-          '../third_party/icu/source/common/rbbirb.cpp',
-          '../third_party/icu/source/common/rbbiscan.cpp',
-          '../third_party/icu/source/common/rbbisetb.cpp',
-          '../third_party/icu/source/common/rbbistbl.cpp',
-          '../third_party/icu/source/common/rbbitblb.cpp',
-          '../third_party/icu/source/common/resbund.cpp',
-          '../third_party/icu/source/common/resbund_cnv.cpp',
-          '../third_party/icu/source/common/ruleiter.cpp',
-          '../third_party/icu/source/common/schriter.cpp',
-          '../third_party/icu/source/common/serv.cpp',
-          '../third_party/icu/source/common/servlk.cpp',
-          '../third_party/icu/source/common/servlkf.cpp',
-          '../third_party/icu/source/common/servls.cpp',
-          '../third_party/icu/source/common/servnotf.cpp',
-          '../third_party/icu/source/common/servrbf.cpp',
-          '../third_party/icu/source/common/servslkf.cpp',
-          '../third_party/icu/source/common/stringpiece.cpp',
-          '../third_party/icu/source/common/triedict.cpp',
-          '../third_party/icu/source/common/uarrsort.c',
-          '../third_party/icu/source/common/ubidi.c',
-          '../third_party/icu/source/common/ubidi_props.c',
-          '../third_party/icu/source/common/ubidiln.c',
-          '../third_party/icu/source/common/ubidiwrt.c',
-          '../third_party/icu/source/common/ubrk.cpp',
-          '../third_party/icu/source/common/ucase.c',
-          '../third_party/icu/source/common/ucasemap.c',
-          '../third_party/icu/source/common/ucat.c',
-          '../third_party/icu/source/common/uchar.c',
-          '../third_party/icu/source/common/uchriter.cpp',
-          '../third_party/icu/source/common/ucln_cmn.c',
-          '../third_party/icu/source/common/ucmndata.c',
-          '../third_party/icu/source/common/ucnv.c',
-          '../third_party/icu/source/common/ucnv2022.c',
-          '../third_party/icu/source/common/ucnv_bld.c',
-          '../third_party/icu/source/common/ucnv_cb.c',
-          '../third_party/icu/source/common/ucnv_cnv.c',
-          '../third_party/icu/source/common/ucnv_err.c',
-          '../third_party/icu/source/common/ucnv_ext.c',
-          '../third_party/icu/source/common/ucnv_io.c',
-          '../third_party/icu/source/common/ucnv_lmb.c',
-          '../third_party/icu/source/common/ucnv_set.c',
-          '../third_party/icu/source/common/ucnv_u16.c',
-          '../third_party/icu/source/common/ucnv_u32.c',
-          '../third_party/icu/source/common/ucnv_u7.c',
-          '../third_party/icu/source/common/ucnv_u8.c',
-          '../third_party/icu/source/common/ucnvbocu.c',
-          '../third_party/icu/source/common/ucnvdisp.c',
-          '../third_party/icu/source/common/ucnvhz.c',
-          '../third_party/icu/source/common/ucnvisci.c',
-          '../third_party/icu/source/common/ucnvlat1.c',
-          '../third_party/icu/source/common/ucnvmbcs.c',
-          '../third_party/icu/source/common/ucnvscsu.c',
-          '../third_party/icu/source/common/ucnvsel.cpp',
-          '../third_party/icu/source/common/ucol_swp.cpp',
-          '../third_party/icu/source/common/udata.cpp',
-          '../third_party/icu/source/common/udatamem.c',
-          '../third_party/icu/source/common/udataswp.c',
-          '../third_party/icu/source/common/uenum.c',
-          '../third_party/icu/source/common/uhash.c',
-          '../third_party/icu/source/common/uhash_us.cpp',
-          '../third_party/icu/source/common/uidna.cpp',
-          '../third_party/icu/source/common/uinit.c',
-          '../third_party/icu/source/common/uinvchar.c',
-          '../third_party/icu/source/common/uiter.cpp',
-          '../third_party/icu/source/common/ulist.c',
-          '../third_party/icu/source/common/uloc.c',
-          '../third_party/icu/source/common/uloc_tag.c',
-          '../third_party/icu/source/common/umapfile.c',
-          '../third_party/icu/source/common/umath.c',
-          '../third_party/icu/source/common/umutex.c',
-          '../third_party/icu/source/common/unames.c',
-          '../third_party/icu/source/common/unifilt.cpp',
-          '../third_party/icu/source/common/unifunct.cpp',
-          '../third_party/icu/source/common/uniset.cpp',
-          '../third_party/icu/source/common/uniset_props.cpp',
-          '../third_party/icu/source/common/unisetspan.cpp',
-          '../third_party/icu/source/common/unistr.cpp',
-          '../third_party/icu/source/common/unistr_case.cpp',
-          '../third_party/icu/source/common/unistr_cnv.cpp',
-          '../third_party/icu/source/common/unistr_props.cpp',
-          '../third_party/icu/source/common/unorm.cpp',
-          '../third_party/icu/source/common/unorm_it.c',
-          '../third_party/icu/source/common/unormcmp.cpp',
-          '../third_party/icu/source/common/uobject.cpp',
-          '../third_party/icu/source/common/uprops.cpp',
-          '../third_party/icu/source/common/ures_cnv.c',
-          '../third_party/icu/source/common/uresbund.c',
-          '../third_party/icu/source/common/uresdata.c',
-          '../third_party/icu/source/common/usc_impl.c',
-          '../third_party/icu/source/common/uscript.c',
-          '../third_party/icu/source/common/uset.cpp',
-          '../third_party/icu/source/common/uset_props.cpp',
-          '../third_party/icu/source/common/usetiter.cpp',
-          '../third_party/icu/source/common/ushape.c',
-          '../third_party/icu/source/common/usprep.cpp',
-          '../third_party/icu/source/common/ustack.cpp',
-          '../third_party/icu/source/common/ustr_cnv.c',
-          '../third_party/icu/source/common/ustr_wcs.c',
-          '../third_party/icu/source/common/ustrcase.c',
-          '../third_party/icu/source/common/ustrenum.cpp',
-          '../third_party/icu/source/common/ustrfmt.c',
-          '../third_party/icu/source/common/ustring.c',
-          '../third_party/icu/source/common/ustrtrns.c',
-          '../third_party/icu/source/common/utext.cpp',
-          '../third_party/icu/source/common/utf_impl.c',
-          '../third_party/icu/source/common/util.cpp',
-          '../third_party/icu/source/common/util_props.cpp',
-          '../third_party/icu/source/common/utrace.c',
-          '../third_party/icu/source/common/utrie.c',
-          '../third_party/icu/source/common/utrie2.cpp',
-          '../third_party/icu/source/common/utrie2_builder.c',
-          '../third_party/icu/source/common/uts46.cpp',
-          '../third_party/icu/source/common/utypes.c',
-          '../third_party/icu/source/common/uvector.cpp',
-          '../third_party/icu/source/common/uvectr32.cpp',
-          '../third_party/icu/source/common/uvectr64.cpp',
-          '../third_party/icu/source/common/wintz.c',
-
-          '../third_party/source/i18n//anytrans.cpp',
-          '../third_party/source/i18n//astro.cpp',
-          '../third_party/source/i18n//basictz.cpp',
-          '../third_party/source/i18n//bms.cpp',
-          '../third_party/source/i18n//bmsearch.cpp',
-          '../third_party/source/i18n//bocsu.c',
-          '../third_party/source/i18n//brktrans.cpp',
-          '../third_party/source/i18n//buddhcal.cpp',
-          '../third_party/source/i18n//calendar.cpp',
-          '../third_party/source/i18n//casetrn.cpp',
-          '../third_party/source/i18n//cecal.cpp',
-          '../third_party/source/i18n//chnsecal.cpp',
-          '../third_party/source/i18n//choicfmt.cpp',
-          '../third_party/source/i18n//coleitr.cpp',
-          '../third_party/source/i18n//coll.cpp',
-          '../third_party/source/i18n//colldata.cpp',
-          '../third_party/source/i18n//coptccal.cpp',
-          '../third_party/source/i18n//cpdtrans.cpp',
-          '../third_party/source/i18n//csdetect.cpp',
-          '../third_party/source/i18n//csmatch.cpp',
-          '../third_party/source/i18n//csr2022.cpp',
-          '../third_party/source/i18n//csrecog.cpp',
-          '../third_party/source/i18n//csrmbcs.cpp',
-          '../third_party/source/i18n//csrsbcs.cpp',
-          '../third_party/source/i18n//csrucode.cpp',
-          '../third_party/source/i18n//csrutf8.cpp',
-          '../third_party/source/i18n//curramt.cpp',
-          '../third_party/source/i18n//currfmt.cpp',
-          '../third_party/source/i18n//currpinf.cpp',
-          '../third_party/source/i18n//currunit.cpp',
-          '../third_party/source/i18n//datefmt.cpp',
-          '../third_party/source/i18n//dcfmtsym.cpp',
-          '../third_party/source/i18n//decContext.c',
-          '../third_party/source/i18n//decNumber.c',
-          '../third_party/source/i18n//decimfmt.cpp',
-          '../third_party/source/i18n//digitlst.cpp',
-          '../third_party/source/i18n//dtfmtsym.cpp',
-          '../third_party/source/i18n//dtitvfmt.cpp',
-          '../third_party/source/i18n//dtitvinf.cpp',
-          '../third_party/source/i18n//dtptngen.cpp',
-          '../third_party/source/i18n//dtrule.cpp',
-          '../third_party/source/i18n//esctrn.cpp',
-          '../third_party/source/i18n//ethpccal.cpp',
-          '../third_party/source/i18n//fmtable.cpp',
-          '../third_party/source/i18n//fmtable_cnv.cpp',
-          '../third_party/source/i18n//format.cpp',
-          '../third_party/source/i18n//fphdlimp.cpp',
-          '../third_party/source/i18n//fpositer.cpp',
-          '../third_party/source/i18n//funcrepl.cpp',
-          '../third_party/source/i18n//gregocal.cpp',
-          '../third_party/source/i18n//gregoimp.cpp',
-          '../third_party/source/i18n//hebrwcal.cpp',
-          '../third_party/source/i18n//indiancal.cpp',
-          '../third_party/source/i18n//inputext.cpp',
-          '../third_party/source/i18n//islamcal.cpp',
-          '../third_party/source/i18n//japancal.cpp',
-          '../third_party/source/i18n//locdspnm.cpp',
-          '../third_party/source/i18n//measfmt.cpp',
-          '../third_party/source/i18n//measure.cpp',
-          '../third_party/source/i18n//msgfmt.cpp',
-          '../third_party/source/i18n//name2uni.cpp',
-          '../third_party/source/i18n//nfrs.cpp',
-          '../third_party/source/i18n//nfrule.cpp',
-          '../third_party/source/i18n//nfsubs.cpp',
-          '../third_party/source/i18n//nortrans.cpp',
-          '../third_party/source/i18n//nultrans.cpp',
-          '../third_party/source/i18n//numfmt.cpp',
-          '../third_party/source/i18n//numsys.cpp',
-          '../third_party/source/i18n//olsontz.cpp',
-          '../third_party/source/i18n//persncal.cpp',
-          '../third_party/source/i18n//plurfmt.cpp',
-          '../third_party/source/i18n//plurrule.cpp',
-          '../third_party/source/i18n//quant.cpp',
-          '../third_party/source/i18n//rbnf.cpp',
-          '../third_party/source/i18n//rbt.cpp',
-          '../third_party/source/i18n//rbt_data.cpp',
-          '../third_party/source/i18n//rbt_pars.cpp',
-          '../third_party/source/i18n//rbt_rule.cpp',
-          '../third_party/source/i18n//rbt_set.cpp',
-          '../third_party/source/i18n//rbtz.cpp',
-          '../third_party/source/i18n//regexcmp.cpp',
-          '../third_party/source/i18n//regexst.cpp',
-          '../third_party/source/i18n//regextxt.cpp',
-          '../third_party/source/i18n//reldtfmt.cpp',
-          '../third_party/source/i18n//rematch.cpp',
-          '../third_party/source/i18n//remtrans.cpp',
-          '../third_party/source/i18n//repattrn.cpp',
-          '../third_party/source/i18n//search.cpp',
-          '../third_party/source/i18n//selfmt.cpp',
-          '../third_party/source/i18n//simpletz.cpp',
-          '../third_party/source/i18n//smpdtfmt.cpp',
-          '../third_party/source/i18n//sortkey.cpp',
-          '../third_party/source/i18n//strmatch.cpp',
-          '../third_party/source/i18n//strrepl.cpp',
-          '../third_party/source/i18n//stsearch.cpp',
-          '../third_party/source/i18n//taiwncal.cpp',
-          '../third_party/source/i18n//tblcoll.cpp',
-          '../third_party/source/i18n//timezone.cpp',
-          '../third_party/source/i18n//titletrn.cpp',
-          '../third_party/source/i18n//tmunit.cpp',
-          '../third_party/source/i18n//tmutamt.cpp',
-          '../third_party/source/i18n//tmutfmt.cpp',
-          '../third_party/source/i18n//tolowtrn.cpp',
-          '../third_party/source/i18n//toupptrn.cpp',
-          '../third_party/source/i18n//translit.cpp',
-          '../third_party/source/i18n//transreg.cpp',
-          '../third_party/source/i18n//tridpars.cpp',
-          '../third_party/source/i18n//tzrule.cpp',
-          '../third_party/source/i18n//tztrans.cpp',
-          '../third_party/source/i18n//ucal.cpp',
-          '../third_party/source/i18n//ucln_in.c',
-          '../third_party/source/i18n//ucol.cpp',
-          '../third_party/source/i18n//ucol_bld.cpp',
-          '../third_party/source/i18n//ucol_cnt.cpp',
-          '../third_party/source/i18n//ucol_elm.cpp',
-          '../third_party/source/i18n//ucol_res.cpp',
-          '../third_party/source/i18n//ucol_sit.cpp',
-          '../third_party/source/i18n//ucol_tok.cpp',
-          '../third_party/source/i18n//ucol_wgt.cpp',
-          '../third_party/source/i18n//ucoleitr.cpp',
-          '../third_party/source/i18n//ucsdet.cpp',
-          '../third_party/source/i18n//ucurr.cpp',
-          '../third_party/source/i18n//udat.cpp',
-          '../third_party/source/i18n//udatpg.cpp',
-          '../third_party/source/i18n//ulocdata.c',
-          '../third_party/source/i18n//umsg.cpp',
-          '../third_party/source/i18n//unesctrn.cpp',
-          '../third_party/source/i18n//uni2name.cpp',
-          '../third_party/source/i18n//unum.cpp',
-          '../third_party/source/i18n//uregex.cpp',
-          '../third_party/source/i18n//uregexc.cpp',
-          '../third_party/source/i18n//usearch.cpp',
-          '../third_party/source/i18n//uspoof.cpp',
-          '../third_party/source/i18n//uspoof_build.cpp',
-          '../third_party/source/i18n//uspoof_conf.cpp',
-          '../third_party/source/i18n//uspoof_impl.cpp',
-          '../third_party/source/i18n//uspoof_wsconf.cpp',
-          '../third_party/source/i18n//utmscale.c',
-          '../third_party/source/i18n//utrans.cpp',
-          '../third_party/source/i18n//vtzone.cpp',
-          '../third_party/source/i18n//vzone.cpp',
-          '../third_party/source/i18n//windtfmt.cpp',
-          '../third_party/source/i18n//winnmfmt.cpp',
-          '../third_party/source/i18n//wintzimpl.cpp',
-          '../third_party/source/i18n//zonemeta.cpp',
-          '../third_party/source/i18n//zrule.cpp',
-          '../third_party/source/i18n//zstrfmt.cpp',
-          '../third_party/source/i18n//ztrans.cpp',
-        ],
       },
     },
   ],
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc
index 4bc85e0..bddf2e7 100644
--- a/ppapi/proxy/ppb_image_data_proxy.cc
+++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -37,7 +37,7 @@ ImageData::ImageData(const HostResource& resource,
 #if defined(OS_NACL)
   // TODO(brettw) implement NaCl ImageData. This will involve just
   // memory-mapping the handle as raw memory rather than as a transport DIB.
-  #error Implement this.
+  NOTIMPLEMENTED();
 #elif defined(OS_WIN)
   transport_dib_.reset(TransportDIB::CreateWithHandle(handle));
 #else
@@ -59,7 +59,7 @@ PP_Bool ImageData::Describe(PP_ImageDataDesc* desc) {
 
 void* ImageData::Map() {
 #if defined(OS_NACL)
-  #error Implement this.
+  NOTIMPLEMENTED();
 #else
   if (!mapped_canvas_.get()) {
     mapped_canvas_.reset(transport_dib_->GetPlatformCanvas(desc_.size.width,
@@ -77,7 +77,7 @@ void* ImageData::Map() {
 
 void ImageData::Unmap() {
 #if defined(OS_NACL)
-  #error Implement this.
+  NOTIMPLEMENTED();
 #else
   // TODO(brettw) have a way to unmap a TransportDIB. Currently this isn't
   // possible since deleting the TransportDIB also frees all the handles.
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index d4a2e456..88e6521 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -114,6 +114,9 @@ bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
                         OnHostMsgLockMouse)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_UnlockMouse,
                         OnHostMsgUnlockMouse)
+    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_SetCursor,
+                        OnHostMsgSetCursor)
+#if !defined(OS_NACL)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_ResolveRelativeToDocument,
                         OnHostMsgResolveRelativeToDocument)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_DocumentCanRequest,
@@ -124,8 +127,7 @@ bool PPB_Instance_Proxy::OnMessageReceived(const IPC::Message& msg) {
                         OnHostMsgGetDocumentURL)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_GetPluginInstanceURL,
                         OnHostMsgGetPluginInstanceURL)
-    IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBInstance_SetCursor,
-                        OnHostMsgSetCursor)
+#endif  // !defined(OS_NACL)
 
     // Host -> Plugin messages.
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBInstance_MouseLockComplete,
@@ -345,6 +347,7 @@ void PPB_Instance_Proxy::ZoomLimitsChanged(PP_Instance instance,
   NOTIMPLEMENTED();
 }
 
+#if !defined(OS_NACL)
 PP_Var PPB_Instance_Proxy::ResolveRelativeToDocument(
     PP_Instance instance,
     PP_Var relative,
@@ -397,6 +400,7 @@ PP_Var PPB_Instance_Proxy::GetPluginInstanceURL(
       result.Return(dispatcher()),
       components);
 }
+#endif  // !defined(OS_NACL)
 
 void PPB_Instance_Proxy::PostMessage(PP_Instance instance,
                                      PP_Var message) {
@@ -615,6 +619,7 @@ void PPB_Instance_Proxy::OnHostMsgUnlockMouse(PP_Instance instance) {
     enter.functions()->UnlockMouse(instance);
 }
 
+#if !defined(OS_NACL)
 void PPB_Instance_Proxy::OnHostMsgResolveRelativeToDocument(
     PP_Instance instance,
     SerializedVarReceiveInput relative,
@@ -664,6 +669,7 @@ void PPB_Instance_Proxy::OnHostMsgGetPluginInstanceURL(
                   enter.functions()->GetPluginInstanceURL(instance, NULL));
   }
 }
+#endif  // !defined(OS_NACL)
 
 void  PPB_Instance_Proxy::OnHostMsgSetCursor(
     PP_Instance instance,
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index fdbeecb..aed90ab 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -87,6 +87,16 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   virtual void ZoomLimitsChanged(PP_Instance instance,
                                  double minimum_factor,
                                  double maximium_factor) OVERRIDE;
+  virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE;
+  virtual PP_Bool SetCursor(PP_Instance instance,
+                            PP_MouseCursor_Type type,
+                            PP_Resource image,
+                            const PP_Point* hot_spot) OVERRIDE;
+  virtual int32_t LockMouse(PP_Instance instance,
+                            PP_CompletionCallback callback) OVERRIDE;
+  virtual void UnlockMouse(PP_Instance instance) OVERRIDE;
+
+#if !defined(OS_NACL)
   virtual PP_Var ResolveRelativeToDocument(
       PP_Instance instance,
       PP_Var relative,
@@ -99,14 +109,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
   virtual PP_Var GetPluginInstanceURL(
       PP_Instance instance,
       PP_URLComponents_Dev* components) OVERRIDE;
-  virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE;
-  virtual PP_Bool SetCursor(PP_Instance instance,
-                            PP_MouseCursor_Type type,
-                            PP_Resource image,
-                            const PP_Point* hot_spot) OVERRIDE;
-  virtual int32_t LockMouse(PP_Instance instance,
-                            PP_CompletionCallback callback) OVERRIDE;
-  virtual void UnlockMouse(PP_Instance instance) OVERRIDE;
+#endif  // !defined(OS_NACL)
 
   static const ApiID kApiID = API_ID_PPB_INSTANCE;
 
@@ -153,6 +156,11 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                             SerializedVarReceiveInput message);
   void OnHostMsgLockMouse(PP_Instance instance);
   void OnHostMsgUnlockMouse(PP_Instance instance);
+  void OnHostMsgSetCursor(PP_Instance instance,
+                          int32_t type,
+                          const ppapi::HostResource& custom_image,
+                          const PP_Point& hot_spot);
+#if !defined(OS_NACL)
   void OnHostMsgResolveRelativeToDocument(PP_Instance instance,
                                           SerializedVarReceiveInput relative,
                                           SerializedVarReturnValue result);
@@ -166,10 +174,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
                                SerializedVarReturnValue result);
   void OnHostMsgGetPluginInstanceURL(PP_Instance instance,
                                      SerializedVarReturnValue result);
-  void OnHostMsgSetCursor(PP_Instance instance,
-                          int32_t type,
-                          const ppapi::HostResource& custom_image,
-                          const PP_Point& hot_spot);
+#endif  // !defined(OS_NACL)
 
   // Host -> Plugin message handlers.
   void OnPluginMsgMouseLockComplete(PP_Instance instance, int32_t result);
diff --git a/ppapi/thunk/ppb_instance_api.h b/ppapi/thunk/ppb_instance_api.h
index 7ce4e78..0993702 100644
--- a/ppapi/thunk/ppb_instance_api.h
+++ b/ppapi/thunk/ppb_instance_api.h
@@ -116,7 +116,7 @@ class PPB_Instance_FunctionAPI {
   virtual void ZoomLimitsChanged(PP_Instance instance,
                                  double minimum_factor,
                                  double maximium_factor) = 0;
-
+#if !defined(OS_NACL)
   // URLUtil.
   virtual PP_Var ResolveRelativeToDocument(
       PP_Instance instance,
@@ -129,6 +129,7 @@ class PPB_Instance_FunctionAPI {
                                 PP_URLComponents_Dev* components) = 0;
   virtual PP_Var GetPluginInstanceURL(PP_Instance instance,
                                       PP_URLComponents_Dev* components) = 0;
+#endif  // !defined(OS_NACL)
 
   static const ApiID kApiID = API_ID_PPB_INSTANCE;
 };