summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 19:05:02 +0000
committerrobertshield@google.com <robertshield@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 19:05:02 +0000
commitfb5e7d01b21d5fdc1aacc6d96240a1ae22b3374d (patch)
tree699d4b1276226c6caa5a01eea4c90688552bb1ae
parenta3f29d61044bcf0bdc4e3e8a20b2c44f6360cdf9 (diff)
downloadchromium_src-fb5e7d01b21d5fdc1aacc6d96240a1ae22b3374d.zip
chromium_src-fb5e7d01b21d5fdc1aacc6d96240a1ae22b3374d.tar.gz
chromium_src-fb5e7d01b21d5fdc1aacc6d96240a1ae22b3374d.tar.bz2
Re-re-enable the pref service ui test, this time making it expect a window size that should fit on even the smallest of likely desktop resolutions.
Review URL: http://codereview.chromium.org/115037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15439 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/pref_service_uitest.cc2
-rw-r--r--chrome/test/data/profiles/window_placement/Local State4
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/pref_service_uitest.cc b/chrome/common/pref_service_uitest.cc
index 1793308..a357af6 100644
--- a/chrome/common/pref_service_uitest.cc
+++ b/chrome/common/pref_service_uitest.cc
@@ -76,7 +76,7 @@ public:
// Also, not sure what should happen on the mac. In any case, the code below
// (minus the Windows bits) compiles fine on my Linux box now.
// TODO(port): revisit this.
-TEST_F(PreferenceServiceTest, DISABLED_PreservedWindowPlacementIsLoaded) {
+TEST_F(PreferenceServiceTest, PreservedWindowPlacementIsLoaded) {
// The window should open with the reference profile
ASSERT_TRUE(LaunchAppWithProfile());
diff --git a/chrome/test/data/profiles/window_placement/Local State b/chrome/test/data/profiles/window_placement/Local State
index 39bc7d5..f2a5b28 100644
--- a/chrome/test/data/profiles/window_placement/Local State
+++ b/chrome/test/data/profiles/window_placement/Local State
@@ -1,10 +1,10 @@
{
"browser" : {
"window_placement" : {
- "bottom" : 610,
+ "bottom" : 400,
"left" : 50,
"maximized" : false,
- "right" : 1014,
+ "right" : 400,
"top" : 50
}
}