summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 02:48:27 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 02:48:27 +0000
commit4bcac78e6c353cd9823f559dc8c6181e824e88ce (patch)
treee14c602e6c08c3d817f4684604b4f35b17c7a27d /chrome/test/testing_profile.cc
parent4dfabc88767a14cb40b7b96ac1e1f1912f03391c (diff)
downloadchromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.zip
chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.tar.gz
chromium_src-4bcac78e6c353cd9823f559dc8c6181e824e88ce.tar.bz2
Revert basically everything I've done today as it fails mysteriously
and I lack the patience to diagnose why mac doesn't link in libjpeg. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.cc')
-rw-r--r--chrome/test/testing_profile.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc
index 7e46932..7514ba1 100644
--- a/chrome/test/testing_profile.cc
+++ b/chrome/test/testing_profile.cc
@@ -5,9 +5,19 @@
#include "chrome/test/testing_profile.h"
#include "base/string_util.h"
-#include "chrome/browser/history/history_backend.h"
#include "chrome/common/chrome_constants.h"
+#if defined(OS_POSIX)
+// TODO(port): get rid of this include. It's used just to provide declarations
+// and stub definitions for classes we encouter during the porting effort.
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
+
+// TODO(port): Get rid of this section and finish porting.
+#if defined(OS_WIN)
+#include "chrome/browser/history/history_backend.h"
+#endif
+
using base::Time;
namespace {