diff options
71 files changed, 172 insertions, 332 deletions
diff --git a/apps/shell_window_geometry_cache_unittest.cc b/apps/shell_window_geometry_cache_unittest.cc index 2b42d48..a4ecdc5 100644 --- a/apps/shell_window_geometry_cache_unittest.cc +++ b/apps/shell_window_geometry_cache_unittest.cc @@ -13,12 +13,8 @@ #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" -namespace { - static const char kWindowId[] = "windowid"; - static const char kWindowId2[] = "windowid2"; - - const char kWindowGeometryKey[] = "window_geometry"; -} // namespace +const char kWindowId[] = "windowid"; +const char kWindowId2[] = "windowid2"; using content::BrowserThread; diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc index 18683e8..c9d5aff 100644 --- a/cc/trees/layer_tree_host_unittest_context.cc +++ b/cc/trees/layer_tree_host_unittest_context.cc @@ -1576,7 +1576,6 @@ class LayerTreeHostContextTestReadbackWithForcedDrawAndOutputSurfaceInit protected: static const int kFirstOutputSurfaceInitSourceFrameNumber = 0; static const int kReadbackSourceFrameNumber = 1; - static const int kReadbackReplacementSourceFrameNumber = 2; static const int kForcedDrawCommitSourceFrameNumber = 2; static const int kSecondOutputSurfaceInitSourceFrameNumber = 2; diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 3de958d..559a199 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -84,7 +84,6 @@ const quota::StorageType kTemporary = quota::kStorageTypeTemporary; const quota::StorageType kPersistent = quota::kStorageTypePersistent; const quota::QuotaClient::ID kClientFile = quota::QuotaClient::kFileSystem; -const quota::QuotaClient::ID kClientDB = quota::QuotaClient::kIndexedDatabase; void PopulateTestQuotaManagedNonBrowsingData(quota::MockQuotaManager* manager) { manager->AddOrigin(kOriginDevTools, kTemporary, kClientFile, base::Time()); diff --git a/chrome/browser/captive_portal/captive_portal_service_unittest.cc b/chrome/browser/captive_portal/captive_portal_service_unittest.cc index 7357b22..f03e155 100644 --- a/chrome/browser/captive_portal/captive_portal_service_unittest.cc +++ b/chrome/browser/captive_portal/captive_portal_service_unittest.cc @@ -28,9 +28,6 @@ namespace captive_portal { namespace { -// A short amount of time that some tests wait for. -const int kShortTimeMs = 10; - // An observer watches the CaptivePortalDetector. It tracks the last // received result and the total number of received results. class CaptivePortalObserver : public content::NotificationObserver { diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index bb9e5bb..0066333 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -80,10 +80,6 @@ class BrowserClosedObserver : public content::NotificationObserver { DISALLOW_COPY_AND_ASSIGN(BrowserClosedObserver); }; -// The delay waited in some cases where we don't have a notifications for an -// action we take. -const int kActionDelayMs = 500; - const char kDebuggerTestPage[] = "files/devtools/debugger_test_page.html"; const char kPauseWhenLoadingDevTools[] = "files/devtools/pause_when_loading_devtools.html"; diff --git a/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc b/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc index 7d5c0cb..613171d 100644 --- a/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/experimental_identity_apitest.cc @@ -37,8 +37,7 @@ namespace { namespace errors = identity_constants; namespace utils = extension_function_test_utils; -static const char kAccessToken[] = "auth_token"; -static const char kExtensionId[] = "ext_id"; +const char kAccessToken[] = "auth_token"; // This helps us be able to wait until an AsyncExtensionFunction calls // SendResponse. diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index 6a2c75d..bc98bb1 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -27,35 +27,41 @@ const char kTestExtensionId[] = "gceegfkgibmgpfopknlcgleimclbknie"; const char kTestExtensionPath[] = "media_galleries_private/gallerywatch"; // JS commands. -const char kAddGalleryChangedListenerCmd[] = "addGalleryChangedListener()"; const char kGetAllWatchedGalleryIdsCmd[] = "getAllWatchedGalleryIds()"; const char kGetMediaFileSystemsCmd[] = "getMediaFileSystems()"; +const char kSetupWatchOnValidGalleriesCmd[] = "setupWatchOnValidGalleries()"; +#if defined(OS_WIN) +const char kAddGalleryChangedListenerCmd[] = "addGalleryChangedListener()"; const char kRemoveAllGalleryWatchCmd[] = "removeAllGalleryWatch()"; const char kRemoveGalleryChangedListenerCmd[] = "removeGalleryChangedListener()"; const char kRemoveGalleryWatchCmd[] = "removeGalleryWatch()"; -const char kSetupWatchOnValidGalleriesCmd[] = "setupWatchOnValidGalleries()"; const char kSetupWatchOnInvalidGalleryCmd[] = "setupWatchOnInvalidGallery()"; +#endif // defined(OS_WIN) // And JS reply messages. const char kAddGalleryWatchOK[] = "add_gallery_watch_ok"; -const char kAddGalleryChangedListenerOK[] = "add_gallery_changed_listener_ok"; const char kGetAllGalleryWatchOK[] = "get_all_gallery_watch_ok"; -const char kGetMediaFileSystemsOK[] = "get_media_file_systems_ok"; const char kGetMediaFileSystemsCallbackOK[] = "get_media_file_systems_callback_ok"; +const char kGetMediaFileSystemsOK[] = "get_media_file_systems_ok"; +#if defined(OS_WIN) +const char kAddGalleryChangedListenerOK[] = "add_gallery_changed_listener_ok"; const char kRemoveAllGalleryWatchOK[] = "remove_all_gallery_watch_ok"; const char kRemoveGalleryChangedListenerOK[] = "remove_gallery_changed_listener_ok"; const char kRemoveGalleryWatchOK[] = "remove_gallery_watch_ok"; +#endif // defined(OS_WIN) // Test reply messages. -const char kAddGalleryWatchRequestSucceeded[] = "add_watch_request_succeeded"; +const char kGetAllGalleryWatchResultA[] = "gallery_watchers_does_not_exists"; const char kAddGalleryWatchRequestFailed[] = "add_watch_request_failed"; +#if defined(OS_WIN) +const char kAddGalleryWatchRequestSucceeded[] = "add_watch_request_succeeded"; const char kGalleryChangedEventReceived[] = "gallery_changed_event_received"; -const char kGetAllGalleryWatchResultA[] = "gallery_watchers_does_not_exists"; const char kGetAllGalleryWatchResultB[] = "watchers_for_galleries_{1, 2, 3}_found"; +#endif // defined(OS_WIN) } // namespace diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc index f5b6195..56c6fb9 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc @@ -35,12 +35,11 @@ using testing::_; namespace chromeos { -namespace { - +#if defined(OS_CHROMEOS) const char kUser1ProfilePath[] = "/profile/user1/shill"; const char kUserIdStubHashSuffix[] = "-hash"; +#endif // defined(OS_CHROMEOS) -} // namespace class ExtensionNetworkingPrivateApiTest : public ExtensionApiTest, diff --git a/chrome/browser/extensions/app_sync_data_unittest.cc b/chrome/browser/extensions/app_sync_data_unittest.cc index c32a56d..f81f07c 100644 --- a/chrome/browser/extensions/app_sync_data_unittest.cc +++ b/chrome/browser/extensions/app_sync_data_unittest.cc @@ -11,16 +11,10 @@ namespace extensions { -namespace { - const char kValidId[] = "abcdefghijklmnopabcdefghijklmnop"; const char kName[] = "MyExtension"; const char kValidVersion[] = "0.0.0.0"; -const char kValidUpdateUrl[] = - "http://clients2.google.com/service/update2/crx"; -const char kOAuthClientId[] = "1234abcd"; - -} // namespace +const char kValidUpdateUrl[] = "http://clients2.google.com/service/update2/crx"; class AppSyncDataTest : public testing::Test { public: diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 75407d7..bec0c65 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -160,20 +160,19 @@ namespace keys = extensions::manifest_keys; namespace { // Extension ids used during testing. -const char* const all_zero = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; -const char* const zero_n_one = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"; -const char* const good0 = "behllobkkfkfnphdnhnkndlbkcpglgmj"; -const char* const good1 = "hpiknbiabeeppbpihjehijgoemciehgk"; -const char* const good2 = "bjafgdebaacbbbecmhlhpofkepfkgcpa"; -const char* const good2048 = "nmgjhmhbleinmjpbdhgajfjkbijcmgbh"; -const char* const good_crx = "ldnnhddmnhbkjipkidpdiheffobcpfmf"; -const char* const hosted_app = "kbmnembihfiondgfjekmnmcbddelicoi"; -const char* const page_action = "obcimlgaoabeegjmmpldobjndiealpln"; -const char* const theme_crx = "iamefpfkojoapidjnbafmgkgncegbkad"; -const char* const theme2_crx = "pjpgmfcmabopnnfonnhmdjglfpjjfkbf"; -const char* const permissions_crx = "eagpmdpfmaekmmcejjbmjoecnejeiiin"; -const char* const unpacked = "cbcdidchbppangcjoddlpdjlenngjldk"; -const char* const updates_from_webstore = "akjooamlhcgeopfifcmlggaebeocgokj"; +const char all_zero[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; +const char good0[] = "behllobkkfkfnphdnhnkndlbkcpglgmj"; +const char good1[] = "hpiknbiabeeppbpihjehijgoemciehgk"; +const char good2[] = "bjafgdebaacbbbecmhlhpofkepfkgcpa"; +const char good2048[] = "nmgjhmhbleinmjpbdhgajfjkbijcmgbh"; +const char good_crx[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf"; +const char hosted_app[] = "kbmnembihfiondgfjekmnmcbddelicoi"; +const char page_action[] = "obcimlgaoabeegjmmpldobjndiealpln"; +const char theme_crx[] = "iamefpfkojoapidjnbafmgkgncegbkad"; +const char theme2_crx[] = "pjpgmfcmabopnnfonnhmdjglfpjjfkbf"; +const char permissions_crx[] = "eagpmdpfmaekmmcejjbmjoecnejeiiin"; +const char unpacked[] = "cbcdidchbppangcjoddlpdjlenngjldk"; +const char updates_from_webstore[] = "akjooamlhcgeopfifcmlggaebeocgokj"; struct ExtensionsOrder { bool operator()(const scoped_refptr<const Extension>& a, diff --git a/chrome/browser/extensions/extension_sync_data_unittest.cc b/chrome/browser/extensions/extension_sync_data_unittest.cc index 637137d..46b3549 100644 --- a/chrome/browser/extensions/extension_sync_data_unittest.cc +++ b/chrome/browser/extensions/extension_sync_data_unittest.cc @@ -14,24 +14,11 @@ namespace { -#if defined(OS_WIN) -const base::FilePath::CharType kExtensionFilePath[] = - FILE_PATH_LITERAL("c:\\foo"); -#elif defined(OS_POSIX) -const base::FilePath::CharType kExtensionFilePath[] = FILE_PATH_LITERAL("/foo"); -#endif - const char kValidId[] = "abcdefghijklmnopabcdefghijklmnop"; -const char kValidVersion[] = "0.0.0.0"; -const char kVersion1[] = "1.0.0.1"; -const char kVersion2[] = "1.0.1.0"; -const char kVersion3[] = "1.1.0.0"; -const char kValidUpdateUrl1[] = - "http://clients2.google.com/service/update2/crx"; -const char kValidUpdateUrl2[] = +const char kVersion[] = "1.0.0.1"; +const char kValidUpdateUrl[] = "https://clients2.google.com/service/update2/crx"; const char kName[] = "MyExtension"; -const char kName2[] = "MyExtension2"; class ExtensionSyncDataTest : public testing::Test { }; @@ -40,10 +27,10 @@ TEST_F(ExtensionSyncDataTest, SyncDataToExtensionSyncDataForExtension) { sync_pb::EntitySpecifics entity; sync_pb::ExtensionSpecifics* extension_specifics = entity.mutable_extension(); extension_specifics->set_id(kValidId); - extension_specifics->set_update_url(kValidUpdateUrl2); + extension_specifics->set_update_url(kValidUpdateUrl); extension_specifics->set_enabled(false); extension_specifics->set_incognito_enabled(true); - extension_specifics->set_version(kVersion1); + extension_specifics->set_version(kVersion); extension_specifics->set_name(kName); syncer::SyncData sync_data = syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); @@ -65,10 +52,10 @@ TEST_F(ExtensionSyncDataTest, ExtensionSyncDataToSyncDataForExtension) { sync_pb::EntitySpecifics entity; sync_pb::ExtensionSpecifics* input_extension = entity.mutable_extension(); input_extension->set_id(kValidId); - input_extension->set_update_url(kValidUpdateUrl2); + input_extension->set_update_url(kValidUpdateUrl); input_extension->set_enabled(true); input_extension->set_incognito_enabled(false); - input_extension->set_version(kVersion1); + input_extension->set_version(kVersion); input_extension->set_name(kName); syncer::SyncData sync_data = syncer::SyncData::CreateLocalData("sync_tag", "non_unique_title", entity); diff --git a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc index 273c016..2eb9174 100644 --- a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc +++ b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc @@ -56,10 +56,6 @@ bool HasBadge(Profile* profile) { const char* ext1_id = "extension1"; const char* ext2_id = "extension2"; -const ExtensionWarning::WarningType warning_1 = - ExtensionWarning::kNetworkDelay; -const ExtensionWarning::WarningType warning_2 = - ExtensionWarning::kNetworkConflict; } // namespace diff --git a/chrome/browser/history/typed_url_syncable_service_unittest.cc b/chrome/browser/history/typed_url_syncable_service_unittest.cc index c97a473..f5919ad 100644 --- a/chrome/browser/history/typed_url_syncable_service_unittest.cc +++ b/chrome/browser/history/typed_url_syncable_service_unittest.cc @@ -27,11 +27,10 @@ using history::VisitVector; namespace { // Constants used to limit size of visits processed. -static const int kMaxTypedUrlVisits = 100; -static const int kMaxVisitsToFetch = 1000; +const int kMaxTypedUrlVisits = 100; // Visits with this timestamp are treated as expired. -static const int EXPIRED_VISIT = -1; +const int EXPIRED_VISIT = -1; // TestChangeProcessor -------------------------------------------------------- diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc index 83f9eba..e623e36 100644 --- a/chrome/browser/importer/firefox_importer_browsertest.cc +++ b/chrome/browser/importer/firefox_importer_browsertest.cc @@ -94,8 +94,6 @@ const KeywordInfo kFirefoxKeywords[] = { { L"\x4E2D\x6587", "http://www.google.com/" }, }; -const int kDefaultFirefoxKeywordIndex = 8; - class FirefoxObserver : public ProfileWriter, public importer::ImporterProgressObserver { public: diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index 769d99f..f2dcc59 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -25,13 +25,6 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/perf/perf_test.h" -static const base::FilePath::CharType kPeerConnectionServer[] = -#if defined(OS_WIN) - FILE_PATH_LITERAL("peerconnection_server.exe"); -#else - FILE_PATH_LITERAL("peerconnection_server"); -#endif - static const base::FilePath::CharType kReferenceFile[] = #if defined (OS_WIN) FILE_PATH_LITERAL("pyauto_private/webrtc/human-voice-win.wav"); diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc index fd4be3f..da6ef73 100644 --- a/chrome/browser/media/encrypted_media_browsertest.cc +++ b/chrome/browser/media/encrypted_media_browsertest.cc @@ -31,20 +31,22 @@ static const char kClearKeyCdmAdapterFileName[] = #endif // defined(ENABLE_PEPPER_CDMS) // Available key systems. -static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey"; -static const char kExternalClearKeyKeySystem[] = +const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey"; +const char kExternalClearKeyKeySystem[] = "org.chromium.externalclearkey"; // Supported media types. -static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; -static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; -static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; -static const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; -static const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\""; +const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; +const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; +const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; +#if defined(USE_PROPRIETARY_CODECS) +const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; +const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\""; +#endif // defined(USE_PROPRIETARY_CODECS) // EME-specific test results and errors. -static const char kEmeGkrException[] = "GENERATE_KEY_REQUEST_EXCEPTION"; -static const char kEmeKeyError[] = "KEYERROR"; +const char kEmeGkrException[] = "GENERATE_KEY_REQUEST_EXCEPTION"; +const char kEmeKeyError[] = "KEYERROR"; // The type of video src used to load media. enum SrcType { diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc index c574d9a..647fdaa 100644 --- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc +++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc @@ -81,16 +81,15 @@ namespace chrome { -static const char kPrefixedClearKey[] = "webkit-org.w3.clearkey"; -static const char kPrefixedClearKeyParent[] = "webkit-org.w3"; +const char kPrefixedClearKey[] = "webkit-org.w3.clearkey"; +const char kPrefixedClearKeyParent[] = "webkit-org.w3"; // TODO(ddorwin): Duplicate prefixed tests for unprefixed. -static const char kUnprefixedClearKey[] = "org.w3.clearkey"; -static const char kUnprefixedClearKeyParent[] = "org.w3"; -static const char kExternalClearKey[] = "org.chromium.externalclearkey"; -static const char kWidevineAlpha[] = "com.widevine.alpha"; -static const char kWidevine[] = "com.widevine"; -static const char kWidevineAlphaHr[] = "com.widevine.alpha.hr"; -static const char kWidevineAlphaHrNonCompositing[] = +const char kUnprefixedClearKey[] = "org.w3.clearkey"; +const char kExternalClearKey[] = "org.chromium.externalclearkey"; +const char kWidevineAlpha[] = "com.widevine.alpha"; +const char kWidevine[] = "com.widevine"; +const char kWidevineAlphaHr[] = "com.widevine.alpha.hr"; +const char kWidevineAlphaHrNonCompositing[] = "com.widevine.alpha.hrnoncompositing"; class EncryptedMediaIsTypeSupportedTest : public InProcessBrowserTest { diff --git a/chrome/browser/net/predictor_unittest.cc b/chrome/browser/net/predictor_unittest.cc index 8ccc3c2..4d50dce 100644 --- a/chrome/browser/net/predictor_unittest.cc +++ b/chrome/browser/net/predictor_unittest.cc @@ -312,8 +312,6 @@ static void AddToSerializedList(const GURL& motivation, subresource_list->Append(new base::FundamentalValue(use_rate)); } -static const int kLatencyNotFound = -1; - // For a given motivation, and subresource, find what latency is currently // listed. This assume a well formed serialization, which has at most one such // entry for any pair of names. If no such pair is found, then return false. diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc index 922cf0a..acd0f25 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate_browsertest.cc @@ -21,11 +21,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/message_center/notification_types.h" -namespace { const char kTestNotificationId[] = "SomeRandomNotificationId"; -const int kNotificationPriority = static_cast<int>( - message_center::LOW_PRIORITY); -} // namespace class StubChromeNotifierService : public notifier::ChromeNotifierService { public: diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc index 980de0b..a8ce03c 100644 --- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc +++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc @@ -41,9 +41,6 @@ using notifier::ChromeNotifierService; namespace { -const int kNotificationPriority = static_cast<int>( - message_center::LOW_PRIORITY); - // Extract notification id from syncer::SyncData. std::string GetNotificationId(const SyncData& sync_data) { SyncedNotificationSpecifics specifics = sync_data.GetSpecifics(). diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index be4e021..e0fb8a5 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -51,18 +51,13 @@ namespace em = enterprise_management; namespace policy { -namespace { - const char kDMToken[] = "dmtoken"; const char kDeviceID[] = "deviceid"; const char kTestExtension[] = "kjmkgkdkpedkejedfhmfcenooemhbpbo"; -const char kTestExtension2[] = "behllobkkfkfnphdnhnkndlbkcpglgmj"; const base::FilePath::CharType kTestExtensionPath[] = FILE_PATH_LITERAL("extensions/managed_extension"); -const base::FilePath::CharType kTestExtension2Path[] = - FILE_PATH_LITERAL("extensions/managed_extension2"); const char kTestPolicy[] = "{" @@ -71,6 +66,11 @@ const char kTestPolicy[] = " }" "}"; +#if defined(OS_CHROMEOS) +const char kTestExtension2[] = "behllobkkfkfnphdnhnkndlbkcpglgmj"; +const base::FilePath::CharType kTestExtension2Path[] = + FILE_PATH_LITERAL("extensions/managed_extension2"); + const char kTestPolicyJSON[] = "{\"Name\":\"disable_all_the_things\"}"; const char kTestPolicy2[] = @@ -81,8 +81,7 @@ const char kTestPolicy2[] = "}"; const char kTestPolicy2JSON[] = "{\"Another\":\"turn_it_off\"}"; - -} // namespace +#endif // defined(OS_CHROMEOS) class ComponentCloudPolicyTest : public ExtensionBrowserTest { protected: diff --git a/chrome/browser/policy/cloud/component_cloud_policy_service_unittest.cc b/chrome/browser/policy/cloud/component_cloud_policy_service_unittest.cc index b29d8b6..deb7724cd 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_service_unittest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_service_unittest.cc @@ -44,7 +44,6 @@ namespace { const char kTestExtension[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; const char kTestExtension2[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; -const char kTestExtension3[] = "cccccccccccccccccccccccccccccccc"; const char kTestDownload[] = "http://example.com/getpolicy?id=123"; const char kTestDownload2[] = "http://example.com/getpolicy?id=456"; diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index e5c6a5b..74012a6 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -178,8 +178,6 @@ const char kGoodCrxId[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf"; const char kAdBlockCrxId[] = "dojnnbeimaimaojcialkkgajdnefpgcn"; const char kHostedAppCrxId[] = "kbmnembihfiondgfjekmnmcbddelicoi"; -const base::FilePath::CharType kGoodCrxManifestName[] = - FILE_PATH_LITERAL("good_update_manifest.xml"); const base::FilePath::CharType kGood2CrxManifestName[] = FILE_PATH_LITERAL("good2_update_manifest.xml"); const base::FilePath::CharType kGoodV1CrxManifestName[] = @@ -188,8 +186,11 @@ const base::FilePath::CharType kGoodUnpackedExt[] = FILE_PATH_LITERAL("good_unpacked"); const base::FilePath::CharType kAppUnpackedExt[] = FILE_PATH_LITERAL("app"); + +#if !defined(OS_MACOSX) const base::FilePath::CharType kUnpackedFullscreenAppName[] = FILE_PATH_LITERAL("fullscreen_app"); +#endif // !defined(OS_MACOSX) // Filters requests to the hosts in |urls| and redirects them to the test data // dir through URLRequestMockHTTPJobs. diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc index 09b7b95..c6d3153 100644 --- a/chrome/browser/printing/print_dialog_cloud_unittest.cc +++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc @@ -43,11 +43,9 @@ using testing::StrEq; using testing::_; using ui::ExternalWebDialogUI; -static const char* const kPDFTestFile = "printing/cloud_print_unittest.pdf"; -static const char* const kEmptyPDFTestFile = - "printing/cloud_print_emptytest.pdf"; -static const char* const kMockJobTitle = "Mock Job Title"; -static const char* const kMockPrintTicket = "Resolution=300"; +const char kPDFTestFile[] = "printing/cloud_print_unittest.pdf"; +const char kMockJobTitle[] = "Mock Job Title"; +const char kMockPrintTicket[] = "Resolution=300"; base::FilePath GetTestDataFileName() { diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index cf455ce..1a3a5fb 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -463,7 +463,6 @@ namespace { const char kEmptyPage[] = "files/empty.html"; const char kMalwareFile[] = "files/downloads/dangerous/dangerous.exe"; -const char kMalwareIframe[] = "files/safe_browsing/malware_iframe.html"; const char kMalwarePage[] = "files/safe_browsing/malware.html"; // This test goes through DownloadResourceHandler. diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc index 3470736..48f6d28 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_file_unittest.cc @@ -13,9 +13,6 @@ namespace { -const base::FilePath::CharType kFolderPrefix[] = - FILE_PATH_LITERAL("SafeBrowsingTestStoreFile"); - class SafeBrowsingStoreFileTest : public PlatformTest { public: virtual void SetUp() { diff --git a/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc b/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc index 48f5e80..ce47b93 100644 --- a/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc +++ b/chrome/browser/safe_browsing/safe_browsing_store_unittest_helper.cc @@ -15,7 +15,6 @@ const int kAddChunk4 = 7; // Disjoint chunk numbers for subs to flush out typos. const int kSubChunk1 = 2; const int kSubChunk2 = 4; -const int kSubChunk3 = 6; const SBFullHash kHash1 = SBFullHashFromString("one"); const SBFullHash kHash2 = SBFullHashFromString("two"); diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc index 6442fbe..edbc6b4 100644 --- a/chrome/browser/sessions/session_types_unittest.cc +++ b/chrome/browser/sessions/session_types_unittest.cc @@ -27,7 +27,6 @@ namespace { -const int kIndex = 3; const int kUniqueID = 50; const content::Referrer kReferrer = content::Referrer(GURL("http://www.referrer.com"), @@ -49,8 +48,6 @@ const base::Time kTimestamp = syncer::ProtoTimeToTime(100); const string16 kSearchTerms = ASCIIToUTF16("my search terms"); const GURL kFaviconURL("http://virtual-url.com/favicon.ico"); -const int kPageID = 10; - // Create a NavigationEntry from the constants above. scoped_ptr<content::NavigationEntry> MakeNavigationEntryForTest() { scoped_ptr<content::NavigationEntry> navigation_entry( diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm index e7660fc..c4171cd 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_section_view_unittest.mm @@ -161,4 +161,4 @@ TEST_F(AutofillSectionViewTest, MouseClicksAreForwarded) { ASSERT_FALSE([delegate didFire]); [test_window() sendEvent:down_event]; EXPECT_TRUE([delegate didFire]); -}
\ No newline at end of file +} diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm index 249ff56..0648bbd 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell_unittest.mm @@ -26,9 +26,6 @@ namespace { // the time. const CGFloat kWidth(300.0); -// A narrow width for tests which test things that don't fit. -const CGFloat kNarrowWidth(5.0); - class FindBarTextFieldCellTest : public CocoaTest { public: FindBarTextFieldCellTest() { diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm index def7ede..9e792ab 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm @@ -33,9 +33,6 @@ namespace { // the time. const CGFloat kWidth(300.0); -// A narrow width for tests which test things that don't fit. -const CGFloat kNarrowWidth(5.0); - class MockDecoration : public LocationBarDecoration { public: virtual CGFloat GetWidthForSpace(CGFloat width) { return 20.0; } diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm index c78d63a..db6cb80 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm @@ -15,8 +15,6 @@ namespace { -const float kLargeWidth = 10000; - // Returns the length of the run starting at |location| for which // |attributeName| remains the same. NSUInteger RunLengthForAttribute(NSAttributedString* string, diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index f7252ab..d8cb7e4 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -203,14 +203,12 @@ typedef WindowedNavigationObserver<chrome::NOTIFICATION_AUTH_CANCELLED> typedef WindowedNavigationObserver<chrome::NOTIFICATION_AUTH_SUPPLIED> WindowedAuthSuppliedObserver; -const char* kPrefetchAuthPage = "files/login/prefetch.html"; +const char kPrefetchAuthPage[] = "files/login/prefetch.html"; -const char* kMultiRealmTestPage = "files/login/multi_realm.html"; -const int kMultiRealmTestRealmCount = 2; -const int kMultiRealmTestResourceCount = 4; +const char kMultiRealmTestPage[] = "files/login/multi_realm.html"; +const int kMultiRealmTestRealmCount = 2; -const char* kSingleRealmTestPage = "files/login/single_realm.html"; -const int kSingleRealmTestResourceCount = 6; +const char kSingleRealmTestPage[] = "files/login/single_realm.html"; const char* kAuthBasicPage = "auth-basic"; const char* kAuthDigestPage = "auth-digest"; diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 38edfc9..9f39b0e 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -68,8 +68,6 @@ const char kSearchSingleChar[] = "z"; const wchar_t kSearchSingleCharKeys[] = { ui::VKEY_Z, 0 }; const char kSearchSingleCharURL[] = "http://www.foo.com/search?q=z"; -const char kHistoryPageURL[] = "chrome://history/#q=abc"; - const char kDesiredTLDHostname[] = "www.bar.com"; const wchar_t kDesiredTLDKeys[] = { ui::VKEY_B, ui::VKEY_A, ui::VKEY_R, 0 }; diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc index 22b2d28..a56c675 100644 --- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc @@ -48,7 +48,6 @@ namespace { MATCHER_P(ModelTypeSetMatches, value, "") { return arg.Equals(value); } const char kTestUser[] = "chrome.p13n.test@gmail.com"; -const char kTestPassword[] = "passwd"; // Returns a ModelTypeSet with all user selectable types set. syncer::ModelTypeSet GetAllTypes() { diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc index ca1335f..f28d2fd 100644 --- a/chrome/renderer/chrome_content_renderer_client_unittest.cc +++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc @@ -34,7 +34,6 @@ const bool kExtensionFromWebStore = true; const bool kNotHostedApp = false; const bool kHostedApp = true; -const char kNaClMimeType[] = "application/x-nacl"; const char kExtensionUrl[] = "chrome-extension://extension_id/background.html"; const char kPhotosAppURL1[] = "https://foo.plus.google.com"; diff --git a/chrome/test/chromedriver/net/adb_client_socket.cc b/chrome/test/chromedriver/net/adb_client_socket.cc index 2f2e50d..3e68a21 100644 --- a/chrome/test/chromedriver/net/adb_client_socket.cc +++ b/chrome/test/chromedriver/net/adb_client_socket.cc @@ -18,7 +18,6 @@ namespace { const int kBufferSize = 16 * 1024; -const int kResponseBufferSize = 16; const char kOkayResponse[] = "OKAY"; const char kHostTransportCommand[] = "host:transport:%s"; const char kLocalAbstractCommand[] = "localabstract:%s"; diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 69c1790..68d3a89 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc @@ -25,7 +25,6 @@ const char kCloudPrintJsonName[] = "cloud_print"; const char kEnabledOptionName[] = "enabled"; const char kEmailOptionName[] = "email"; -const char kPasswordOptionName[] = "password"; const char kProxyIdOptionName[] = "proxy_id"; const char kRobotEmailOptionName[] = "robot_email"; const char kRobotTokenOptionName[] = "robot_refresh_token"; diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc index e9662a5..75a9d6d 100644 --- a/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc +++ b/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.cc @@ -34,14 +34,6 @@ namespace wallet { namespace { -const char kGetTokenPairValidResponse[] = - "{" - " \"refresh_token\": \"rt1\"," - " \"access_token\": \"at1\"," - " \"expires_in\": 3600," - " \"token_type\": \"Bearer\"" - "}"; - const char kGetAccountInfoValidResponseFormat[] = "{\"user_info\":[" " {" diff --git a/components/autofill/core/browser/password_autofill_manager_unittest.cc b/components/autofill/core/browser/password_autofill_manager_unittest.cc index d7c5cfd..96ce202 100644 --- a/components/autofill/core/browser/password_autofill_manager_unittest.cc +++ b/components/autofill/core/browser/password_autofill_manager_unittest.cc @@ -7,19 +7,13 @@ #include "components/autofill/core/browser/password_autofill_manager.h" #include "testing/gtest/include/gtest/gtest.h" -namespace { - // The name of the username/password element in the form. -const char* const kUsernameName = "username"; -const char* const kInvalidUsername = "no-username"; -const char* const kPasswordName = "password"; - -const char* const kAliceUsername = "alice"; -const char* const kAlicePassword = "password"; - -const char* const kValue = "password"; +const char kUsernameName[] = "username"; +const char kInvalidUsername[] = "no-username"; +const char kPasswordName[] = "password"; -} // namespace +const char kAliceUsername[] = "alice"; +const char kAlicePassword[] = "password"; namespace autofill { diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index e1d9483..f9d60ba 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -49,20 +49,6 @@ namespace { const char kHTMLForGuest[] = "data:text/html,<html><body>hello world</body></html>"; -const char kHTMLForGuestBusyLoop[] = - "data:text/html,<html><head><script type=\"text/javascript\">" - "function PauseMs(timems) {" - " document.title = \"start\";" - " var date = new Date();" - " var currDate = null;" - " do {" - " currDate = new Date();" - " } while (currDate - date < timems)" - "}" - "function StartPauseMs(timems) {" - " setTimeout(function() { PauseMs(timems); }, 0);" - "}" - "</script></head><body></body></html>"; const char kHTMLForGuestTouchHandler[] = "data:text/html,<html><body><div id=\"touch\">With touch</div></body>" "<script type=\"text/javascript\">" diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index b3df24d..46a00659 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -18,8 +18,6 @@ static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey"; static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; -static const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; -static const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\""; // EME-specific test results and errors. static const char kEmeGkrException[] = "GENERATE_KEY_REQUEST_EXCEPTION"; diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc index f554b5e..8970691 100644 --- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc +++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc @@ -30,33 +30,21 @@ using ::testing::Invoke; using ::testing::_; -namespace { -static const char kGetAuthCodeValidCookie[] = +const char kGetAuthCodeValidCookie[] = "oauth_code=test-code; Path=/test; Secure; HttpOnly"; -static const char kGetAuthCodeCookieNoSecure[] = +const char kGetAuthCodeCookieNoSecure[] = "oauth_code=test-code; Path=/test; HttpOnly"; -static const char kGetAuthCodeCookieNoHttpOnly[] = +const char kGetAuthCodeCookieNoHttpOnly[] = "oauth_code=test-code; Path=/test; Secure"; -static const char kGetAuthCodeCookieNoOAuthCode[] = +const char kGetAuthCodeCookieNoOAuthCode[] = "Path=/test; Secure; HttpOnly"; -static const char kGetTokenPairValidResponse[] = +const char kGetTokenPairValidResponse[] = "{" " \"refresh_token\": \"rt1\"," " \"access_token\": \"at1\"," " \"expires_in\": 3600," " \"token_type\": \"Bearer\"" "}"; -static const char kClientOAuthValidResponse[] = - "{" - " \"oauth2\": {" - " \"refresh_token\": \"rt1\"," - " \"access_token\": \"at1\"," - " \"expires_in\": 3600," - " \"token_type\": \"Bearer\"" - " }" - "}"; - -} // namespace MockFetcher::MockFetcher(bool success, const GURL& url, diff --git a/gpu/config/gpu_control_list_unittest.cc b/gpu/config/gpu_control_list_unittest.cc index 0113a84..f28c5e4 100644 --- a/gpu/config/gpu_control_list_unittest.cc +++ b/gpu/config/gpu_control_list_unittest.cc @@ -11,9 +11,7 @@ const char kOsVersion[] = "10.6.4"; const uint32 kIntelVendorId = 0x8086; -const uint32 kIntelDeviceId = 0x0166; // 3rd Gen Core Graphics const uint32 kNvidiaVendorId = 0x10de; -const uint32 kNvidiaDeviceId = 0x0fd5; // GeForce GT 650M #define LONG_STRING_CONST(...) #__VA_ARGS__ diff --git a/gpu/config/gpu_driver_bug_list_unittest.cc b/gpu/config/gpu_driver_bug_list_unittest.cc index 014c24e..597e730 100644 --- a/gpu/config/gpu_driver_bug_list_unittest.cc +++ b/gpu/config/gpu_driver_bug_list_unittest.cc @@ -10,8 +10,6 @@ #include "gpu/config/gpu_info.h" #include "testing/gtest/include/gtest/gtest.h" -const char kOsVersion[] = "10.6.4"; - namespace gpu { class GpuDriverBugListTest : public testing::Test { diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/jingle/glue/pseudotcp_adapter_unittest.cc index 08e59fc..7d1870c 100644 --- a/jingle/glue/pseudotcp_adapter_unittest.cc +++ b/jingle/glue/pseudotcp_adapter_unittest.cc @@ -28,11 +28,6 @@ namespace jingle_glue { namespace { -// The range is chosen arbitrarily. It must be big enough so that we -// always have at least two UDP ports available. -const int kMinPort = 32000; -const int kMaxPort = 33000; - const int kMessageSize = 1024; const int kMessages = 100; const int kTestDataSize = kMessages * kMessageSize; diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc index 96da77d..e667c08 100644 --- a/media/audio/audio_output_device_unittest.cc +++ b/media/audio/audio_output_device_unittest.cc @@ -124,8 +124,6 @@ class AudioOutputDeviceTest DISALLOW_COPY_AND_ASSIGN(AudioOutputDeviceTest); }; -static const int kStreamId = 123; - int AudioOutputDeviceTest::CalculateMemorySize() { // Calculate output and input memory size. int output_memory_size = diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc index 8853068..5893583 100644 --- a/media/base/audio_renderer_mixer_unittest.cc +++ b/media/base/audio_renderer_mixer_unittest.cc @@ -22,18 +22,17 @@ namespace media { // Parameters which control the many input case tests. -static const int kMixerInputs = 8; -static const int kMixerCycles = 3; +const int kMixerInputs = 8; +const int kMixerCycles = 3; // Parameters used for testing. -static const int kBitsPerChannel = 32; -static const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO; -static const int kHighLatencyBufferSize = 8192; -static const int kLowLatencyBufferSize = 256; -static const int kSampleRate = 48000; +const int kBitsPerChannel = 32; +const ChannelLayout kChannelLayout = CHANNEL_LAYOUT_STEREO; +const int kHighLatencyBufferSize = 8192; +const int kLowLatencyBufferSize = 256; // Number of full sine wave cycles for each Render() call. -static const int kSineCycles = 4; +const int kSineCycles = 4; // Tuple of <input sampling rate, output sampling rate, epsilon>. typedef std::tr1::tuple<int, int, double> AudioRendererMixerTestData; diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index 4c8640c..2e4c528 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -36,8 +36,7 @@ using ::testing::WithArg; namespace media { // Demuxer properties. -static const int kTotalBytes = 1024; -static const int kBitrate = 1234; +const int kTotalBytes = 1024; ACTION_P(SetDemuxerProperties, duration) { arg0->SetTotalBytes(kTotalBytes); diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc index a4b865c..4132b97 100644 --- a/media/cdm/aes_decryptor_unittest.cc +++ b/media/cdm/aes_decryptor_unittest.cc @@ -26,23 +26,21 @@ MATCHER(IsEmpty, "") { return arg.empty(); } namespace media { -static const char kClearKeySystem[] = "org.w3.clearkey"; +const uint8 kOriginalData[] = "Original subsample data."; +const int kOriginalDataSize = 24; -static const uint8 kOriginalData[] = "Original subsample data."; -static const int kOriginalDataSize = 24; - -static const uint8 kKeyId[] = { +const uint8 kKeyId[] = { // base64 equivalent is AAECAw== 0x00, 0x01, 0x02, 0x03 }; -static const uint8 kKey[] = { +const uint8 kKey[] = { // base64 equivalent is BAUGBwgJCgsMDQ4PEBESEw== 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 }; -static const char kKeyAsJWK[] = +const char kKeyAsJWK[] = "{" " \"keys\": [" " {" @@ -53,7 +51,7 @@ static const char kKeyAsJWK[] = " ]" "}"; -static const char kWrongKeyAsJWK[] = +const char kWrongKeyAsJWK[] = "{" " \"keys\": [" " {" @@ -64,7 +62,7 @@ static const char kWrongKeyAsJWK[] = " ]" "}"; -static const char kWrongSizedKeyAsJWK[] = +const char kWrongSizedKeyAsJWK[] = "{" " \"keys\": [" " {" @@ -75,14 +73,14 @@ static const char kWrongSizedKeyAsJWK[] = " ]" "}"; -static const uint8 kIv[] = { +const uint8 kIv[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; // kOriginalData encrypted with kKey and kIv but without any subsamples (or // equivalently using kSubsampleEntriesCypherOnly). -static const uint8 kEncryptedData[] = { +const uint8 kEncryptedData[] = { 0x2f, 0x03, 0x09, 0xef, 0x71, 0xaf, 0x31, 0x16, 0xfa, 0x9d, 0x18, 0x43, 0x1e, 0x96, 0x71, 0xb5, 0xbf, 0xf5, 0x30, 0x53, 0x9a, 0x20, 0xdf, 0x95 @@ -90,27 +88,27 @@ static const uint8 kEncryptedData[] = { // kOriginalData encrypted with kSubsampleKey and kSubsampleIv using // kSubsampleEntriesNormal. -static const uint8 kSubsampleEncryptedData[] = { +const uint8 kSubsampleEncryptedData[] = { 0x4f, 0x72, 0x09, 0x16, 0x09, 0xe6, 0x79, 0xad, 0x70, 0x73, 0x75, 0x62, 0x09, 0xbb, 0x83, 0x1d, 0x4d, 0x08, 0xd7, 0x78, 0xa4, 0xa7, 0xf1, 0x2e }; -static const uint8 kOriginalData2[] = "Changed Original data."; +const uint8 kOriginalData2[] = "Changed Original data."; -static const uint8 kIv2[] = { +const uint8 kIv2[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -static const uint8 kKeyId2[] = { +const uint8 kKeyId2[] = { // base64 equivalent is AAECAwQFBgcICQoLDA0ODxAREhM= 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13 }; -static const char kKey2AsJWK[] = +const char kKey2AsJWK[] = "{" " \"keys\": [" " {" @@ -123,7 +121,7 @@ static const char kKey2AsJWK[] = // 'k' in bytes is x14x15x16x17x18x19x1ax1bx1cx1dx1ex1fx20x21x22x23 -static const uint8 kEncryptedData2[] = { +const uint8 kEncryptedData2[] = { 0x57, 0x66, 0xf4, 0x12, 0x1a, 0xed, 0xb5, 0x79, 0x1c, 0x8e, 0x25, 0xd7, 0x17, 0xe7, 0x5e, 0x16, 0xe3, 0x40, 0x08, 0x27, 0x11, 0xe9 @@ -133,31 +131,31 @@ static const uint8 kEncryptedData2[] = { // all entries must be equal to kOriginalDataSize to make the subsample entries // valid. -static const SubsampleEntry kSubsampleEntriesNormal[] = { +const SubsampleEntry kSubsampleEntriesNormal[] = { { 2, 7 }, { 3, 11 }, { 1, 0 } }; -static const SubsampleEntry kSubsampleEntriesWrongSize[] = { +const SubsampleEntry kSubsampleEntriesWrongSize[] = { { 3, 6 }, // This entry doesn't match the correct entry. { 3, 11 }, { 1, 0 } }; -static const SubsampleEntry kSubsampleEntriesInvalidTotalSize[] = { +const SubsampleEntry kSubsampleEntriesInvalidTotalSize[] = { { 1, 1000 }, // This entry is too large. { 3, 11 }, { 1, 0 } }; -static const SubsampleEntry kSubsampleEntriesClearOnly[] = { +const SubsampleEntry kSubsampleEntriesClearOnly[] = { { 7, 0 }, { 8, 0 }, { 9, 0 } }; -static const SubsampleEntry kSubsampleEntriesCypherOnly[] = { +const SubsampleEntry kSubsampleEntriesCypherOnly[] = { { 0, 6 }, { 0, 8 }, { 0, 10 } diff --git a/media/cdm/ppapi/clear_key_cdm.cc b/media/cdm/ppapi/clear_key_cdm.cc index cd6a61f..8c561b3 100644 --- a/media/cdm/ppapi/clear_key_cdm.cc +++ b/media/cdm/ppapi/clear_key_cdm.cc @@ -19,7 +19,7 @@ #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) #include "base/basictypes.h" -static const int64 kNoTimestamp = kint64min; +const int64 kNoTimestamp = kint64min; #endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) @@ -59,15 +59,14 @@ static bool InitializeFFmpegLibraries() { static bool g_ffmpeg_lib_initialized = InitializeFFmpegLibraries(); #endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER -static const char kClearKeyCdmVersion[] = "0.1.0.1"; -static const char kExternalClearKey[] = "org.chromium.externalclearkey"; -static const int64 kSecondsPerMinute = 60; -static const int64 kMsPerSecond = 1000; -static const int64 kInitialTimerDelayMs = 200; -static const int64 kMaxTimerDelayMs = 1 * kSecondsPerMinute * kMsPerSecond; +const char kClearKeyCdmVersion[] = "0.1.0.1"; +const int64 kSecondsPerMinute = 60; +const int64 kMsPerSecond = 1000; +const int64 kInitialTimerDelayMs = 200; +const int64 kMaxTimerDelayMs = 1 * kSecondsPerMinute * kMsPerSecond; // Heart beat message header. If a key message starts with |kHeartBeatHeader|, // it's a heart beat message. Otherwise, it's a key request. -static const char kHeartBeatHeader[] = "HEARTBEAT"; +const char kHeartBeatHeader[] = "HEARTBEAT"; // Copies |input_buffer| into a media::DecoderBuffer. If the |input_buffer| is // empty, an empty (end-of-stream) media::DecoderBuffer is returned. diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc index 649e058..aab4a9d 100644 --- a/media/filters/audio_renderer_algorithm_unittest.cc +++ b/media/filters/audio_renderer_algorithm_unittest.cc @@ -26,10 +26,9 @@ namespace media { -static const int kFrameSize = 250; -static const int kSamplesPerSecond = 3000; -static const SampleFormat kSampleFormat = kSampleFormatS16; -static const int kOutputDurationInSec = 10; +const int kFrameSize = 250; +const int kSamplesPerSecond = 3000; +const int kOutputDurationInSec = 10; static void FillWithSquarePulseTrain( int half_pulse_width, int offset, int num_samples, float* data) { diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index 0ce2fd1..0ea768d 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -21,51 +21,55 @@ using testing::AtMost; namespace media { -static const char kSourceId[] = "SourceId"; -static const char kClearKeySystem[] = "org.w3.clearkey"; -static const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 }; - -static const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\""; -static const char kWebMVP9[] = "video/webm; codecs=\"vp9\""; -static const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\""; -static const char kOpusAudioOnlyWebM[] = "video/webm; codecs=\"opus\""; -static const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\""; -static const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\""; -static const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\""; -static const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\""; -static const char kMP4AudioType[] = "audio/mp4"; -static const char kMP4VideoType[] = "video/mp4"; -static const char kMP3[] = "audio/mpeg"; +const char kSourceId[] = "SourceId"; +const uint8 kInitData[] = { 0x69, 0x6e, 0x69, 0x74 }; + +const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\""; +const char kWebMVP9[] = "video/webm; codecs=\"vp9\""; +const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\""; +const char kOpusAudioOnlyWebM[] = "video/webm; codecs=\"opus\""; +const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\""; +const char kMP4VideoType[] = "video/mp4"; +const char kMP4AudioType[] = "audio/mp4"; +#if defined(USE_PROPRIETARY_CODECS) +const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\""; +const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\""; +const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\""; +const char kMP3[] = "audio/mpeg"; +#endif // defined(USE_PROPRIETARY_CODECS) // Key used to encrypt test files. -static const uint8 kSecretKey[] = { +const uint8 kSecretKey[] = { 0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b, 0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c }; // The key ID for all encrypted files. -static const uint8 kKeyId[] = { +const uint8 kKeyId[] = { 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35 }; -static const int kAppendWholeFile = -1; +const int kAppendWholeFile = -1; // Constants for the Media Source config change tests. -static const int kAppendTimeSec = 1; -static const int kAppendTimeMs = kAppendTimeSec * 1000; -static const int k320WebMFileDurationMs = 2737; -static const int k640WebMFileDurationMs = 2763; -static const int k640IsoFileDurationMs = 2737; -static const int k640IsoCencFileDurationMs = 2736; -static const int k1280IsoFileDurationMs = 2736; -static const int kOpusEndTrimmingWebMFileDurationMs = 2771; -static const uint32 kOpusEndTrimmingWebMFileAudioBytes = 528676; -static const int kVP9WebMFileDurationMs = 2735; -static const int kVP8AWebMFileDurationMs = 2700; +const int kAppendTimeSec = 1; +const int kAppendTimeMs = kAppendTimeSec * 1000; +const int k320WebMFileDurationMs = 2737; +const int k640WebMFileDurationMs = 2763; +const int kOpusEndTrimmingWebMFileDurationMs = 2771; +const uint32 kOpusEndTrimmingWebMFileAudioBytes = 528676; +const int kVP9WebMFileDurationMs = 2735; +const int kVP8AWebMFileDurationMs = 2700; // Command line switch for runtime adjustment of audio file to be benchmarked. -static const char kBenchmarkAudioFile[] = "benchmark-audio-file"; +const char kBenchmarkAudioFile[] = "benchmark-audio-file"; + +#if defined(USE_PROPRIETARY_CODECS) +const int k640IsoFileDurationMs = 2737; +const int k640IsoCencFileDurationMs = 2736; +const int k1280IsoFileDurationMs = 2736; +#endif // defined(USE_PROPRIETARY_CODECS) // Note: Tests using this class only exercise the DecryptingDemuxerStream path. // They do not exercise the Decrypting{Audio|Video}Decoder path. diff --git a/media/webm/webm_tracks_parser_unittest.cc b/media/webm/webm_tracks_parser_unittest.cc index 1ba3111..ad001ab 100644 --- a/media/webm/webm_tracks_parser_unittest.cc +++ b/media/webm/webm_tracks_parser_unittest.cc @@ -15,9 +15,6 @@ using ::testing::_; namespace media { -static const int kTypeSubtitlesOrCaptions = 0x11; -static const int kTypeDescriptionsOrMetadata = 0x21; - class WebMTracksParserTest : public testing::Test { public: WebMTracksParserTest() {} diff --git a/net/tools/dump_cache/dump_cache.cc b/net/tools/dump_cache/dump_cache.cc index dd423b7..d4ccc29 100644 --- a/net/tools/dump_cache/dump_cache.cc +++ b/net/tools/dump_cache/dump_cache.cc @@ -32,6 +32,7 @@ enum Errors { TOOL_NOT_FOUND, }; +#if defined(OS_WIN) const char kUpgradeHelp[] = "\nIn order to use the upgrade function, a version of this tool that\n" "understands the file format of the files to upgrade is needed. For\n" @@ -39,6 +40,7 @@ const char kUpgradeHelp[] = "a version of this program that was compiled with version 3.4 has to be\n" "located beside this executable, and named dump_cache_3.exe, and this\n" "executable should be compiled with version 5.2 being the current one."; +#endif // defined(OS_WIN) // Folders to read and write cache files. const char kInputPath[] = "input"; @@ -58,7 +60,9 @@ const char kUpgrade[] = "upgrade"; // Internal use: const char kSlave[] = "slave"; +#if defined(OS_WIN) const char kPipe[] = "pipe"; +#endif // defined(OS_WIN) int Help() { printf("warning: input files are modified by this tool\n"); diff --git a/ppapi/tests/test_audio.cc b/ppapi/tests/test_audio.cc index 167efa6..4fea6e8 100644 --- a/ppapi/tests/test_audio.cc +++ b/ppapi/tests/test_audio.cc @@ -18,8 +18,6 @@ REGISTER_TEST_CASE(Audio); -const int32_t kMagicValue = 12345; - TestAudio::TestAudio(TestingInstance* instance) : TestCase(instance), audio_callback_method_(NULL), diff --git a/ppapi/tests/test_fullscreen.cc b/ppapi/tests/test_fullscreen.cc index 2fddbdf..8651b74 100644 --- a/ppapi/tests/test_fullscreen.cc +++ b/ppapi/tests/test_fullscreen.cc @@ -22,8 +22,6 @@ REGISTER_TEST_CASE(Fullscreen); namespace { -const ColorPremul kOpaqueWhite = { 0xFF, 0xFF, 0xFF, 0xFF }; -const ColorPremul kSheerRed = { 0x88, 0x88, 0x00, 0x00 }; const ColorPremul kSheerBlue = { 0x88, 0x00, 0x00, 0x88 }; const ColorPremul kOpaqueYellow = { 0xFF, 0xFF, 0xFF, 0x00 }; const int kBytesPerPixel = sizeof(uint32_t); // 4 bytes for BGRA or RGBA. diff --git a/ppapi/tests/test_tcp_server_socket_private.cc b/ppapi/tests/test_tcp_server_socket_private.cc index 20b9d5e..2465d51 100644 --- a/ppapi/tests/test_tcp_server_socket_private.cc +++ b/ppapi/tests/test_tcp_server_socket_private.cc @@ -18,13 +18,6 @@ using pp::NetAddressPrivate; using pp::TCPServerSocketPrivate; using pp::TCPSocketPrivate; -namespace { - -const uint16_t kPortScanFrom = 1024; -const uint16_t kPortScanTo = 4096; - -} // namespace - REGISTER_TEST_CASE(TCPServerSocketPrivate); TestTCPServerSocketPrivate::TestTCPServerSocketPrivate( diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc index 6cc774d..3b654e2 100644 --- a/ppapi/tests/test_websocket.cc +++ b/ppapi/tests/test_websocket.cc @@ -47,7 +47,6 @@ const char* const kInvalidURLs[] = { }; // Internal packet sizes. -const uint64_t kCloseFrameSize = 6; const uint64_t kMessageFrameOverhead = 6; namespace { diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc index f78bbf9..3862900 100644 --- a/remoting/base/auto_thread_unittest.cc +++ b/remoting/base/auto_thread_unittest.cc @@ -17,7 +17,6 @@ namespace { const char kThreadName[] = "Test thread"; -const char kThreadName2[] = "Test thread 2"; void SetFlagTask(bool* success) { *success = true; diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc index 9b95ed9..a261017 100644 --- a/remoting/host/config_file_watcher.cc +++ b/remoting/host/config_file_watcher.cc @@ -24,9 +24,11 @@ const char kHostConfigSwitchName[] = "host-config"; const base::FilePath::CharType kDefaultHostConfigFile[] = FILE_PATH_LITERAL("host.json"); +#if defined(OS_WIN) // Maximum number of times to try reading the configuration file before // reporting an error. const int kMaxRetries = 3; +#endif // defined(OS_WIN) class ConfigFileWatcherImpl : public base::RefCountedThreadSafe<ConfigFileWatcherImpl> { diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc index 9065af4..e4ce866 100644 --- a/remoting/host/register_support_host_request_unittest.cc +++ b/remoting/host/register_support_host_request_unittest.cc @@ -34,7 +34,6 @@ namespace remoting { namespace { const char kTestBotJid[] = "remotingunittest@bot.talk.google.com"; const char kTestJid[] = "user@gmail.com/chromoting123"; -const int64 kTestTime = 123123123; const char kSupportId[] = "AB4RF3"; const char kSupportIdLifetime[] = "300"; const char kStanzaId[] = "123"; diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 9ed3383..97886e9 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc @@ -103,9 +103,11 @@ namespace { // This is used for tagging system event logs. const char kApplicationName[] = "chromoting"; +#if defined(OS_LINUX) // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; +#endif // defined(OS_LINUX) // The command line switch used by the parent to request the host to signal it // when it is successfully started. diff --git a/remoting/host/server_log_entry.cc b/remoting/host/server_log_entry.cc index b13f6c6..8ef8e49 100644 --- a/remoting/host/server_log_entry.cc +++ b/remoting/host/server_log_entry.cc @@ -43,10 +43,6 @@ const char kStatusName[] = "status"; const char kExitCodeName[] = "exit-code"; const char kKeyOsName[] = "os-name"; -const char kValueOsNameWindows[] = "Windows"; -const char kValueOsNameLinux[] = "Linux"; -const char kValueOsNameMac[] = "Mac"; -const char kValueOsNameChromeOS[] = "ChromeOS"; const char kKeyOsVersion[] = "os-version"; @@ -102,13 +98,13 @@ scoped_ptr<ServerLogEntry> ServerLogEntry::MakeForHostStatus( void ServerLogEntry::AddHostFields() { #if defined(OS_WIN) - Set(kKeyOsName, kValueOsNameWindows); + Set(kKeyOsName, "Windows"); #elif defined(OS_MACOSX) - Set(kKeyOsName, kValueOsNameMac); + Set(kKeyOsName, "Mac"); #elif defined(OS_CHROMEOS) - Set(kKeyOsName, kValueOsNameChromeOS); + Set(kKeyOsName, "ChromeOS"); #elif defined(OS_LINUX) - Set(kKeyOsName, kValueOsNameLinux); + Set(kKeyOsName, "Linux"); #endif // SysInfo::OperatingSystemVersionNumbers is only defined for the following diff --git a/remoting/host/service_urls.cc b/remoting/host/service_urls.cc index e73fc2a..8d8f083 100644 --- a/remoting/host/service_urls.cc +++ b/remoting/host/service_urls.cc @@ -7,8 +7,6 @@ #include "base/command_line.h" #include "base/logging.h" -namespace { - // Configurable service data. const char kDirectoryBaseUrl[] = "https://www.googleapis.com/chromoting/v1"; const char kXmppServerAddress[] = "talk.google.com:5222"; @@ -16,16 +14,16 @@ const bool kXmppServerUseTls = true; const char kDirectoryBotJid[] = "remoting@bot.talk.google.com"; // Command line switches. +#if !defined(NDEBUG) const char kDirectoryBaseUrlSwitch[] = "directory-base-url"; const char kXmppServerAddressSwitch[] = "xmpp-server-address"; const char kXmppServerDisableTlsSwitch[] = "disable-xmpp-server-tls"; const char kDirectoryBotJidSwitch[] = "directory-bot-jid"; +#endif // !defined(NDEBUG) // Non-configurable service paths. const char kDirectoryHostsSuffix[] = "/@me/hosts/"; -} // namespace - namespace remoting { ServiceUrls::ServiceUrls() diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc index d0d83dd..a9ae148 100644 --- a/skia/ext/platform_canvas_unittest.cc +++ b/skia/ext/platform_canvas_unittest.cc @@ -187,9 +187,6 @@ const int kInnerY = 5; const int kInnerW = 2; const int kInnerH = 3; -// Radius used by some tests to draw a rounded-corner rectangle. -const SkScalar kRadius = 2.0; - } // This just checks that our checking code is working properly, it just uses @@ -381,6 +378,7 @@ TEST(PlatformCanvas, TranslateLayer) { SkRect rect; rect.iset(kInnerX - 1, kInnerY - 1, kInnerX + kInnerW, kInnerY + kInnerH); + const SkScalar kRadius = 2.0; path.addRoundRect(rect, kRadius, kRadius); canvas->clipPath(path); diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc index b1a9646..970fed5 100644 --- a/sync/engine/syncer_unittest.cc +++ b/sync/engine/syncer_unittest.cc @@ -3249,8 +3249,6 @@ TEST_F(SyncerTest, UpdateWhereParentIsNotAFolder) { } } -const char kRootId[] = "0"; - TEST_F(SyncerTest, DirectoryUpdateTest) { Id in_root_id = ids_.NewServerId(); Id in_in_root_id = ids_.NewServerId(); diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index dc47365..2e0d9ae 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -96,8 +96,6 @@ using syncable::kEncryptedString; namespace { -const char kTestChromeVersion[] = "test chrome version"; - void ExpectInt64Value(int64 expected_value, const base::DictionaryValue& value, const std::string& key) { diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 95c4211..436b342 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -64,7 +64,6 @@ const char kXmppHostPortSwitch[] = "xmpp-host-port"; const char kXmppTrySslTcpFirstSwitch[] = "xmpp-try-ssltcp-first"; const char kXmppAllowInsecureConnectionSwitch[] = "xmpp-allow-insecure-connection"; -const char kNotificationMethodSwitch[] = "notification-method"; // Needed to use a real host resolver. class MyTestURLRequestContext : public net::TestURLRequestContext { diff --git a/sync/tools/sync_listen_notifications.cc b/sync/tools/sync_listen_notifications.cc index 9cebcee..b70ee6d 100644 --- a/sync/tools/sync_listen_notifications.cc +++ b/sync/tools/sync_listen_notifications.cc @@ -45,7 +45,6 @@ const char kTokenSwitch[] = "token"; const char kHostPortSwitch[] = "host-port"; const char kTrySslTcpFirstSwitch[] = "try-ssltcp-first"; const char kAllowInsecureConnectionSwitch[] = "allow-insecure-connection"; -const char kNotificationMethodSwitch[] = "notification-method"; // Class to print received notifications events. class NotificationPrinter : public InvalidationHandler { diff --git a/third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc b/third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc index f7330c3..4657cf5 100644 --- a/third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc +++ b/third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc @@ -25,10 +25,6 @@ #include "encodings/compact_lang_det/win/cld_commandlineflags.h" #include "encodings/compact_lang_det/win/cld_google.h" -DEFINE_bool(html, false, "Print language spans in HTML on stderr"); -DEFINE_bool(detail, false, "Print incoming text to stderr"); -DEFINE_bool(skipbig, false, "Skip BigInputTests"); - // Test strings. // These are all included here to make the unit test self-contained. const char* kTeststr_en = |