summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-16 11:09:53 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-16 11:09:53 +0000
commitc855113f01088a707fb7538f6c54e284635cc779 (patch)
tree0a1fe2f1bf493e0cba27e189ffc55db454d07317 /chrome
parentcb0236a6ee8f3c14458915b1036171a2753e39e3 (diff)
downloadchromium_src-c855113f01088a707fb7538f6c54e284635cc779.zip
chromium_src-c855113f01088a707fb7538f6c54e284635cc779.tar.gz
chromium_src-c855113f01088a707fb7538f6c54e284635cc779.tar.bz2
Make history_unittest pass on Linux.
Review URL: http://codereview.chromium.org/21352 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/page_transition_types.h7
-rw-r--r--chrome/test/unit/unit_tests.scons1
2 files changed, 2 insertions, 6 deletions
diff --git a/chrome/common/page_transition_types.h b/chrome/common/page_transition_types.h
index 2d30199..eca4a56 100644
--- a/chrome/common/page_transition_types.h
+++ b/chrome/common/page_transition_types.h
@@ -22,9 +22,6 @@ class PageTransition {
// A type is made of a core value and a set of qualifiers. A type has one
// core value and 0 or or more qualifiers.
enum {
- // force this enum to be signed for gcc's benefit
- UNUSED = -1,
-
// User got to this page by clicking a link on another page.
LINK = 0,
@@ -111,10 +108,10 @@ class PageTransition {
};
// The type used for the bitfield.
- typedef int Type;
+ typedef unsigned int Type;
static bool ValidType(int32 type) {
- int32 t = StripQualifier(static_cast<Type>(type));
+ Type t = StripQualifier(static_cast<Type>(type));
return (t >= 0 && t <= LAST_CORE);
}
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index c03c439..1e2abdb 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -396,7 +396,6 @@ if not env.Bit('windows'):
'$CHROME_DIR/browser/download/download_request_manager_unittest.cc',
'$CHROME_DIR/browser/download/save_package_unittest.cc',
'$CHROME_DIR/browser/extensions/user_script_master_unittest.cc',
- '$CHROME_DIR/browser/history/history_unittest.cc',
'$CHROME_DIR/browser/importer/firefox_importer_unittest.cc',
'$CHROME_DIR/browser/importer/importer_unittest.cc',
'$CHROME_DIR/browser/login_prompt_unittest.cc',