summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.h
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.h
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.h')
-rw-r--r--chrome/test/testing_profile.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 53167a2..bcaa346 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -10,7 +10,6 @@
#include "base/path_service.h"
#include "base/file_util.h"
#include "chrome/browser/browser_prefs.h"
-#include "chrome/browser/history/history.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/common/pref_service.h"
@@ -24,6 +23,7 @@
// TODO(port): Get rid of this section and finish porting.
#if defined(OS_WIN)
#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/history/history.h"
#include "chrome/browser/sessions/session_service.h"
#endif