Chromium Code Reviews

Issue 5329008: Tentative fix for the Clang mac build. (Closed)

Created:
10 years ago by hans
Modified:
9 years, 5 months ago
Reviewers:
markusheintz_, Nico
CC:
chromium-reviews, ben+cc_chromium.org, Paweł Hajdan Jr.
Visibility:
Public.

Description

Tentative fix for the Clang mac build. The Clang mac build does not compile the EXPECT_EQ(false, blah... statements. I'm not sure why, and it doesn't reproduce on my Linux box, but hopefully this should green the bot. In any case, I believe EXPECT_FALSE is the preferred style. TEST=unit_tests BUG=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67718

Patch Set 1 #

Unified diffs Side-by-side diffs Stats (+6 lines, -9 lines)
M chrome/browser/content_settings/host_content_settings_map_unittest.cc View 1 chunk +6 lines, -9 lines 0 comments

Messages

Total messages: 3 (0 generated)
hans
10 years ago (2010-11-30 16:42:08 UTC) #1
markusheintz_
Lgtm If trybots cycle green
10 years ago (2010-11-30 17:10:59 UTC) #2
Nico
10 years ago (2010-11-30 17:14:50 UTC) #3
LG, thanks.
On Nov 30, 2010 8:42 AM, <hans@chromium.org> wrote:
> Reviewers: Nico, markusheintz_,
>
> Description:
> Tentative fix for the Clang mac build.
>
> The Clang mac build does not compile the EXPECT_EQ(false, blah...
> statements. I'm not sure why, and it doesn't reproduce on my Linux box,
> but hopefully this should green the bot. In any case, I believe
> EXPECT_FALSE is the preferred style.
>
> TEST=unit_tests
> BUG=none
>
> Please review this at http://codereview.chromium.org/5329008/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src
>
> Affected files:
> M chrome/browser/content_settings/host_content_settings_map_unittest.cc
>
>
> Index:
chrome/browser/content_settings/host_content_settings_map_unittest.cc
> diff --git
> a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
> b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
> index
>
223b08f55523246480b29873f5f4156b1e64f423..5f6bf5c6b4ce9077eb00f54cb6f620d3bedce8fe

> 100644
> ---
a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
> +++
b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
> @@ -995,24 +995,21 @@ TEST_F(HostContentSettingsMapTest,
> ResetToDefaultsWhenManaged) {
> prefs->SetUserPref(prefs::kBlockThirdPartyCookies,
> Value::CreateBooleanValue(true));
>
> - EXPECT_EQ(true,
> - host_content_settings_map->IsBlockThirdPartyCookiesManaged());
> - EXPECT_EQ(true, host_content_settings_map->BlockThirdPartyCookies());
> +
> EXPECT_TRUE(host_content_settings_map->IsBlockThirdPartyCookiesManaged());
> + EXPECT_TRUE(host_content_settings_map->BlockThirdPartyCookies());
>
> // Reset to the default value (false).
> host_content_settings_map->ResetToDefaults();
> // Since the preference BlockThirdPartyCookies is managed the
> // HostContentSettingsMap should still return the managed value which is
> true.
> - EXPECT_EQ(true,
> - host_content_settings_map->IsBlockThirdPartyCookiesManaged());
> - EXPECT_EQ(true, host_content_settings_map->BlockThirdPartyCookies());
> +
> EXPECT_TRUE(host_content_settings_map->IsBlockThirdPartyCookiesManaged());
> + EXPECT_TRUE(host_content_settings_map->BlockThirdPartyCookies());
>
> // After unsetting the managed value for the preference
> BlockThirdPartyCookies
> // the default value should be returned now.
> prefs->RemoveManagedPref(prefs::kBlockThirdPartyCookies);
> - EXPECT_EQ(false,
> - host_content_settings_map->IsBlockThirdPartyCookiesManaged());
> - EXPECT_EQ(false, host_content_settings_map->BlockThirdPartyCookies());
> +
>
EXPECT_FALSE(host_content_settings_map->IsBlockThirdPartyCookiesManaged());
> + EXPECT_FALSE(host_content_settings_map->BlockThirdPartyCookies());
> }
>
> } // namespace
>
>

Powered by Google App Engine