1 --- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code 2009-08-27 15:21:27.000000000 -0400
2 +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc 2009-08-27 16:05:17.000000000 -0400
7 -#include "base/third_party/nspr/prtime.h"
8 +#include <nspr/prtime.h>
10 #include "testing/gtest/include/gtest/gtest.h"
12 --- chromium-20090827svn24640/src/base/time.cc.system-code 2009-08-27 15:21:28.000000000 -0400
13 +++ chromium-20090827svn24640/src/base/time.cc 2009-08-27 16:05:17.000000000 -0400
15 #include "base/time.h"
16 #include "base/string_util.h"
17 #include "base/sys_string_conversions.h"
18 -#include "base/third_party/nspr/prtime.h"
19 +#include <nspr/prtime.h>
21 #include "base/logging.h"
23 --- chromium-20090827svn24640/src/chrome/common/zip.cc.system-code 2009-08-27 15:22:46.000000000 -0400
24 +++ chromium-20090827svn24640/src/chrome/common/zip.cc 2009-08-27 16:05:17.000000000 -0400
26 #include "base/file_util.h"
27 #include "base/string_util.h"
28 #include "net/base/file_stream.h"
29 -#include "third_party/zlib/contrib/minizip/unzip.h"
30 -#include "third_party/zlib/contrib/minizip/zip.h"
31 +#include <minizip/unzip.h>
32 +#include <minizip/zip.h>
34 #include "third_party/zlib/contrib/minizip/iowin32.h"
36 --- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc~ 2010-01-07 23:19:11.000000000 +0200
37 +++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc 2010-02-02 09:16:08.740140511 +0200
40 // These headers must be included in this order to make the declaration gods
42 -#include "base/third_party/nspr/prcpucfg_linux.h"
43 +#include <nspr/prcpucfg.h>
47 --- chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~ 2010-07-21 05:01:25.000000000 +0300
48 +++ chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc 2010-07-22 13:58:51.340525649 +0300
50 #include "base/scoped_ptr.h"
51 #include "base/string_util.h"
52 #include "base/sys_info.h"
53 -#include "base/third_party/nspr/prtime.h"
54 +#include <nspr/prtime.h>
55 #include "base/time.h"
56 #include "base/utf_string_conversions.h"
57 #include "chrome/browser/autocomplete/autocomplete.h"
58 --- chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc.orig 2011-07-19 04:00:59.000000000 +0200
59 +++ chromium-browser-14.0.830.0~svn20110722r93513/src/chrome/common/metrics_helpers.cc 2011-07-22 20:43:47.608727449 +0200
61 #include "base/perftimer.h"
62 #include "base/string_number_conversions.h"
63 #include "base/sys_info.h"
64 -#include "base/third_party/nspr/prtime.h"
65 +#include <nspr/prtime.h>
66 #include "base/time.h"
67 #include "base/utf_string_conversions.h"
68 #include "chrome/common/logging_chrome.h"