diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 02:04:30 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-02 02:04:30 +0000 |
commit | e3a8a926da1f7e3365a6f0dbb9061af975a36361 (patch) | |
tree | dbc062c0b6bcb7f117f3d42071d39c8106488a47 | |
parent | 30cbdf8c2c40e0c43d75d8e4ea6310254022d3ca (diff) | |
download | chromium_src-e3a8a926da1f7e3365a6f0dbb9061af975a36361.zip chromium_src-e3a8a926da1f7e3365a6f0dbb9061af975a36361.tar.gz chromium_src-e3a8a926da1f7e3365a6f0dbb9061af975a36361.tar.bz2 |
clang/mac: Fix most easy problems in chrome.xcodeproj (all targets)
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/3550006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61280 0039d316-1c4b-4281-b951-d872f2087c98
16 files changed, 37 insertions, 112 deletions
diff --git a/chrome/browser/cocoa/accelerators_cocoa_unittest.mm b/chrome/browser/cocoa/accelerators_cocoa_unittest.mm index 28b9986..b829351 100644 --- a/chrome/browser/cocoa/accelerators_cocoa_unittest.mm +++ b/chrome/browser/cocoa/accelerators_cocoa_unittest.mm @@ -17,7 +17,7 @@ TEST(AcceleratorsCocoaTest, GetAccelerator) { keymap->GetAcceleratorForCommand(IDC_COPY); ASSERT_TRUE(accelerator); EXPECT_NSEQ(@"c", accelerator->characters()); - EXPECT_EQ(NSCommandKeyMask, accelerator->modifiers()); + EXPECT_EQ(static_cast<int>(NSCommandKeyMask), accelerator->modifiers()); } TEST(AcceleratorsCocoaTest, GetNullAccelerator) { diff --git a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm index 9298349..bd8ad5c 100644 --- a/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm +++ b/chrome/browser/cocoa/content_settings_dialog_controller_unittest.mm @@ -174,19 +174,19 @@ TEST_F(ContentSettingsDialogControllerTest, PluginsSetting) { setting = settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS); EXPECT_EQ(CONTENT_SETTING_ALLOW, setting); - EXPECT_EQ(false, settingsMap_->GetBlockNonsandboxedPlugins()); + EXPECT_FALSE(settingsMap_->GetBlockNonsandboxedPlugins()); [controller_ setPluginsEnabledIndex:kPluginsAllowSandboxedIndex]; setting = settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS); EXPECT_EQ(CONTENT_SETTING_ALLOW, setting); - EXPECT_EQ(true, settingsMap_->GetBlockNonsandboxedPlugins()); + EXPECT_TRUE(settingsMap_->GetBlockNonsandboxedPlugins()); [controller_ setPluginsEnabledIndex:kPluginsBlockIndex]; setting = settingsMap_->GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS); EXPECT_EQ(CONTENT_SETTING_BLOCK, setting); - EXPECT_EQ(false, settingsMap_->GetBlockNonsandboxedPlugins()); + EXPECT_FALSE(settingsMap_->GetBlockNonsandboxedPlugins()); } TEST_F(ContentSettingsDialogControllerTest, PopupsSetting) { diff --git a/chrome/browser/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/cocoa/history_menu_bridge_unittest.mm index e370fe8..a3fd2b6 100644 --- a/chrome/browser/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/history_menu_bridge_unittest.mm @@ -378,7 +378,7 @@ TEST_F(HistoryMenuBridgeTest, GotFaviconData) { GotFaviconData(item.icon_handle, true, bytes, false, GURL()); // Make sure the callback works. - EXPECT_EQ(false, item.icon_requested); + EXPECT_FALSE(item.icon_requested); EXPECT_TRUE(item.icon.get()); EXPECT_TRUE([item.menu_item image]); } diff --git a/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm b/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm index cfb1595..fc21da0 100644 --- a/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm +++ b/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm @@ -24,14 +24,6 @@ using ::testing::A; namespace { -int NumTypesOnPasteboard(NSPasteboard* pb) { - return [[pb types] count]; -} - -void ClearPasteboard(NSPasteboard* pb) { - [pb declareTypes:[NSArray array] owner:nil]; -} - // TODO(shess): Very similar to AutocompleteTextFieldTest. Maybe // those can be shared. diff --git a/chrome/browser/extensions/extension_cookies_unittest.cc b/chrome/browser/extensions/extension_cookies_unittest.cc index ec9084a..6665052 100644 --- a/chrome/browser/extensions/extension_cookies_unittest.cc +++ b/chrome/browser/extensions/extension_cookies_unittest.cc @@ -116,15 +116,15 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) { EXPECT_TRUE(cookie_value1->GetString(keys::kDomainKey, &string_value)); EXPECT_EQ("www.foobar.com", string_value); EXPECT_TRUE(cookie_value1->GetBoolean(keys::kHostOnlyKey, &boolean_value)); - EXPECT_EQ(true, boolean_value); + EXPECT_TRUE(boolean_value); EXPECT_TRUE(cookie_value1->GetString(keys::kPathKey, &string_value)); EXPECT_EQ("/", string_value); EXPECT_TRUE(cookie_value1->GetBoolean(keys::kSecureKey, &boolean_value)); - EXPECT_EQ(false, boolean_value); + EXPECT_FALSE(boolean_value); EXPECT_TRUE(cookie_value1->GetBoolean(keys::kHttpOnlyKey, &boolean_value)); - EXPECT_EQ(false, boolean_value); + EXPECT_FALSE(boolean_value); EXPECT_TRUE(cookie_value1->GetBoolean(keys::kSessionKey, &boolean_value)); - EXPECT_EQ(true, boolean_value); + EXPECT_TRUE(boolean_value); EXPECT_FALSE( cookie_value1->GetReal(keys::kExpirationDateKey, &double_value)); EXPECT_TRUE(cookie_value1->GetString(keys::kStoreIdKey, &string_value)); @@ -137,9 +137,9 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) { extension_cookies_helpers::CreateCookieValue( cookie2, "some cookie store")); EXPECT_TRUE(cookie_value2->GetBoolean(keys::kHostOnlyKey, &boolean_value)); - EXPECT_EQ(false, boolean_value); + EXPECT_FALSE(boolean_value); EXPECT_TRUE(cookie_value2->GetBoolean(keys::kSessionKey, &boolean_value)); - EXPECT_EQ(false, boolean_value); + EXPECT_FALSE(boolean_value); EXPECT_TRUE(cookie_value2->GetReal(keys::kExpirationDateKey, &double_value)); EXPECT_EQ(10000, double_value); diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 53d91c6..46adb45 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -70,18 +70,6 @@ namespace history { namespace { -// Compares the two data values. Used for comparing thumbnail data. -bool DataEqual(const unsigned char* reference, size_t reference_len, - const std::vector<unsigned char>& data) { - if (reference_len != data.size()) - return false; - for (size_t i = 0; i < reference_len; i++) { - if (data[i] != reference[i]) - return false; - } - return true; -} - // The tracker uses RenderProcessHost pointers for scoping but never // dereferences them. We use ints because it's easier. This function converts // between the two. @@ -883,29 +871,6 @@ TEST(HistoryProfileTest, TypicalProfileVersion) { namespace { -// Use this dummy value to scope the page IDs we give history. -static const void* kAddArgsScope = reinterpret_cast<void*>(0x12345678); - -// Creates a new HistoryAddPageArgs object for sending to the history database -// with reasonable defaults and the given NULL-terminated URL string. The -// returned object will NOT be add-ref'ed, which is the responsibility of the -// caller. -HistoryAddPageArgs* MakeAddArgs(const GURL& url) { - return new HistoryAddPageArgs(url, - Time::Now(), - kAddArgsScope, - 0, - GURL(), - history::RedirectList(), - PageTransition::TYPED, - history::SOURCE_BROWSED, false); -} - -// Convenience version of the above to convert a char string. -HistoryAddPageArgs* MakeAddArgs(const char* url) { - return MakeAddArgs(GURL(url)); -} - // A HistoryDBTask implementation. Each time RunOnDBThread is invoked // invoke_count is increment. When invoked kWantInvokeCount times, true is // returned from RunOnDBThread which should stop RunOnDBThread from being diff --git a/chrome/browser/importer/firefox_importer_unittest.cc b/chrome/browser/importer/firefox_importer_unittest.cc index 060015d..73c70a4 100644 --- a/chrome/browser/importer/firefox_importer_unittest.cc +++ b/chrome/browser/importer/firefox_importer_unittest.cc @@ -93,7 +93,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) { charset, &folder_name, &is_toolbar_folder); EXPECT_TRUE(result); EXPECT_EQ(L"< > & \" ' \\ /", folder_name); - EXPECT_EQ(false, is_toolbar_folder); + EXPECT_FALSE(is_toolbar_folder); // Empty name and toolbar folder attribute. result = Firefox2Importer::ParseFolderNameFromLine( @@ -101,7 +101,7 @@ TEST(FirefoxImporterTest, Firefox2BookmarkParse) { charset, &folder_name, &is_toolbar_folder); EXPECT_TRUE(result); EXPECT_EQ(L"", folder_name); - EXPECT_EQ(true, is_toolbar_folder); + EXPECT_TRUE(is_toolbar_folder); // Unicode characters in title and shortcut. std::wstring title; diff --git a/chrome/browser/net/passive_log_collector_unittest.cc b/chrome/browser/net/passive_log_collector_unittest.cc index 0e8c19a..18530a6 100644 --- a/chrome/browser/net/passive_log_collector_unittest.cc +++ b/chrome/browser/net/passive_log_collector_unittest.cc @@ -45,28 +45,6 @@ PassiveLogCollector::Entry MakeEndLogEntry(int source_id) { NULL); } -void AddStartURLRequestEntries(PassiveLogCollector* collector, uint32 id) { - collector->OnAddEntry(NetLog::TYPE_REQUEST_ALIVE, base::TimeTicks(), - NetLog::Source(NetLog::SOURCE_URL_REQUEST, id), - NetLog::PHASE_BEGIN, NULL); - collector->OnAddEntry(NetLog::TYPE_URL_REQUEST_START_JOB, base::TimeTicks(), - NetLog::Source(NetLog::SOURCE_URL_REQUEST, id), - NetLog::PHASE_BEGIN, new URLRequestStartEventParameters( - GURL(StringPrintf("http://req%d", id)), "GET", 0, - net::LOW)); -} - -void AddEndURLRequestEntries(PassiveLogCollector* collector, uint32 id) { - collector->OnAddEntry(NetLog::TYPE_REQUEST_ALIVE, base::TimeTicks(), - NetLog::Source(NetLog::SOURCE_URL_REQUEST, id), - NetLog::PHASE_END, NULL); -} - -std::string GetStringParam(const PassiveLogCollector::Entry& entry) { - return static_cast<net::NetLogStringParameter*>( - entry.params.get())->value(); -} - bool OrderBySourceID(const PassiveLogCollector::SourceInfo& a, const PassiveLogCollector::SourceInfo& b) { return a.source_id < b.source_id; diff --git a/chrome/browser/speech/speech_recognition_request_unittest.cc b/chrome/browser/speech/speech_recognition_request_unittest.cc index 303735f..dcf0e9b 100644 --- a/chrome/browser/speech/speech_recognition_request_unittest.cc +++ b/chrome/browser/speech/speech_recognition_request_unittest.cc @@ -61,24 +61,24 @@ TEST_F(SpeechRecognitionRequestTest, BasicTest) { // Normal success case with one result. CreateAndTestRequest(true, "{\"hypotheses\":[{\"utterance\":\"123456\",\"confidence\":0.9}]}"); - EXPECT_EQ(false, error_); + EXPECT_FALSE(error_); EXPECT_EQ(ASCIIToUTF16("123456"), result_); // Normal success case with multiple results. CreateAndTestRequest(true, "{\"hypotheses\":[{\"utterance\":\"hello\",\"confidence\":0.9}," "{\"utterance\":\"123456\",\"confidence\":0.5}]}"); - EXPECT_EQ(false, error_); + EXPECT_FALSE(error_); EXPECT_EQ(ASCIIToUTF16("hello"), result_); // Http failure case. CreateAndTestRequest(false, ""); - EXPECT_EQ(true, error_); + EXPECT_TRUE(error_); EXPECT_EQ(ASCIIToUTF16(""), result_); // Malformed JSON case. CreateAndTestRequest(true, "{\"hypotheses\":[{\"unknownkey\":\"hello\"}]}"); - EXPECT_EQ(true, error_); + EXPECT_TRUE(error_); EXPECT_EQ(ASCIIToUTF16(""), result_); } diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc index 6dfe793..885fd25 100644 --- a/chrome/browser/sync/syncable/syncable_unittest.cc +++ b/chrome/browser/sync/syncable/syncable_unittest.cc @@ -1650,12 +1650,6 @@ TEST(Syncable, ComparePathNames) { } } -void FakeSync(MutableEntry* e, const char* fake_id) { - e->Put(IS_UNSYNCED, false); - e->Put(BASE_VERSION, 2); - e->Put(ID, Id::CreateFromServerId(fake_id)); -} - class SyncableClientTagTest : public SyncableDirectoryTest { public: static const int kBaseVersion = 1; diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index 49a0caa..d103b65 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -258,7 +258,7 @@ TEST_F(TabContentsTest, NTPViewSource) { controller().RendererDidNavigate(params, 0, &details); // Also check title and url. EXPECT_EQ(ASCIIToUTF16(kUrl), contents()->GetTitle()); - EXPECT_EQ(true, contents()->ShouldDisplayURL()); + EXPECT_TRUE(contents()->ShouldDisplayURL()); } // Test simple same-SiteInstance navigation. @@ -760,8 +760,8 @@ TEST_F(TabContentsTest, WebKitPrefs) { // These values have been overridden by the profile preferences. EXPECT_EQ("UTF-8", webkit_prefs.default_encoding); EXPECT_EQ(20, webkit_prefs.default_font_size); - EXPECT_EQ(false, webkit_prefs.text_areas_are_resizable); - EXPECT_EQ(true, webkit_prefs.uses_universal_detector); + EXPECT_FALSE(webkit_prefs.text_areas_are_resizable); + EXPECT_TRUE(webkit_prefs.uses_universal_detector); // These should still be the default values. #if defined(OS_MACOSX) @@ -772,7 +772,7 @@ TEST_F(TabContentsTest, WebKitPrefs) { const wchar_t kDefaultFont[] = L"Times New Roman"; #endif EXPECT_EQ(kDefaultFont, webkit_prefs.standard_font_family); - EXPECT_EQ(true, webkit_prefs.javascript_enabled); + EXPECT_TRUE(webkit_prefs.javascript_enabled); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/common/common_param_traits_unittest.cc b/chrome/common/common_param_traits_unittest.cc index aed1c36..48b08f8 100644 --- a/chrome/common/common_param_traits_unittest.cc +++ b/chrome/common/common_param_traits_unittest.cc @@ -18,13 +18,14 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#if defined(OS_WIN) #ifndef NDEBUG namespace { void IgnoreAssertHandler(const std::string& str) { } } // namespace - #endif // NDEBUG +#endif // defined(OS_WIN) // Tests that serialize/deserialize correctly understand each other TEST(IPCMessageTest, Serialize) { diff --git a/chrome/common/extensions/extension_action_unittest.cc b/chrome/common/extensions/extension_action_unittest.cc index 1e3c8d4..4413bfe 100644 --- a/chrome/common/extensions/extension_action_unittest.cc +++ b/chrome/common/extensions/extension_action_unittest.cc @@ -73,19 +73,19 @@ TEST(ExtensionActionTest, TabSpecificState) { ASSERT_EQ(1, action.GetIconIndex(1)); // visibility - ASSERT_EQ(false, action.GetIsVisible(1)); + ASSERT_FALSE(action.GetIsVisible(1)); action.SetIsVisible(ExtensionAction::kDefaultTabId, true); - ASSERT_EQ(true, action.GetIsVisible(1)); - ASSERT_EQ(true, action.GetIsVisible(100)); + ASSERT_TRUE(action.GetIsVisible(1)); + ASSERT_TRUE(action.GetIsVisible(100)); action.SetIsVisible(ExtensionAction::kDefaultTabId, false); - ASSERT_EQ(false, action.GetIsVisible(1)); - ASSERT_EQ(false, action.GetIsVisible(100)); + ASSERT_FALSE(action.GetIsVisible(1)); + ASSERT_FALSE(action.GetIsVisible(100)); action.SetIsVisible(100, true); - ASSERT_EQ(false, action.GetIsVisible(1)); - ASSERT_EQ(true, action.GetIsVisible(100)); + ASSERT_FALSE(action.GetIsVisible(1)); + ASSERT_TRUE(action.GetIsVisible(100)); action.ClearAllValuesForTab(100); - ASSERT_EQ(false, action.GetIsVisible(1)); - ASSERT_EQ(false, action.GetIsVisible(100)); + ASSERT_FALSE(action.GetIsVisible(1)); + ASSERT_FALSE(action.GetIsVisible(100)); // badge text ASSERT_EQ("", action.GetBadgeText(1)); diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc index 2a55737..21beaf3 100644 --- a/chrome/renderer/spellchecker/spellcheck_unittest.cc +++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc @@ -17,11 +17,6 @@ namespace { -// Represents a special initialization function used only for the unit tests -// in this file. -extern void InitHunspellWithFiles(FILE* file_aff_hunspell, - FILE* file_dic_hunspell); - FilePath GetHunspellDirectory() { FilePath hunspell_directory; if (!PathService::Get(base::DIR_SOURCE_ROOT, &hunspell_directory)) diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc index 4dd0f41..c629ed0 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc @@ -369,7 +369,7 @@ scoped_refptr<TabProxy> AutomatedUITestBase::GetActiveTab() { BrowserProxy* browser = active_browser(); if (browser == NULL) { LogErrorMessage("browser_window_not_found"); - return false; + return NULL; } return browser->GetActiveTab(); diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 8c5927c..82d8a9c 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -358,7 +358,7 @@ class PageLoadTest : public UITest { // Verify everything is fine EXPECT_EQ(NAVIGATION_SUCCESS, metrics.result); EXPECT_EQ(0, metrics.crash_dump_count); - EXPECT_EQ(true, metrics.browser_clean_exit); + EXPECT_TRUE(metrics.browser_clean_exit); EXPECT_EQ(1, metrics.browser_launch_count); // Both starting page and test_url_1 are loaded. EXPECT_EQ(2, metrics.page_load_count); @@ -371,7 +371,7 @@ class PageLoadTest : public UITest { // Found a crash dump EXPECT_EQ(1, metrics.crash_dump_count) << kFailedNoCrashService; // Browser did not crash, and exited cleanly. - EXPECT_EQ(true, metrics.browser_clean_exit); + EXPECT_TRUE(metrics.browser_clean_exit); EXPECT_EQ(1, metrics.browser_launch_count); // Only the renderer should have crashed. EXPECT_EQ(0, metrics.browser_crash_count); @@ -383,7 +383,7 @@ class PageLoadTest : public UITest { // metrics for a successful page load. EXPECT_EQ(NAVIGATION_SUCCESS, metrics.result); EXPECT_EQ(0, metrics.crash_dump_count); - EXPECT_EQ(true, metrics.browser_clean_exit); + EXPECT_TRUE(metrics.browser_clean_exit); EXPECT_EQ(1, metrics.browser_launch_count); EXPECT_EQ(0, metrics.browser_crash_count); EXPECT_EQ(0, metrics.renderer_crash_count); @@ -406,7 +406,7 @@ class PageLoadTest : public UITest { GetStabilityMetrics(&metrics); // This is not a clean shutdown. - EXPECT_EQ(false, metrics.browser_clean_exit); + EXPECT_FALSE(metrics.browser_clean_exit); EXPECT_EQ(1, metrics.browser_crash_count); EXPECT_EQ(0, metrics.renderer_crash_count); EXPECT_EQ(0, metrics.plugin_crash_count); |