Remove unneeded extern keywords.

TBR=reveman@chromium.org,dgozman@chromium.org,lfg@chromium.org,sdefresne@chromium.org,rockot@chromium.org

Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I2b94ac88777958e132dce4772fda9ba12320c560
Reviewed-on: https://chromium-review.googlesource.com/771053
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#517467}

cc/base/devtools_instrumentation.cc

@@ -8,27 +8,27 @@ namespace cc {
 namespace devtools_instrumentation {
 
 namespace internal {
-extern const char kCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
-extern const char kCategoryFrame[] =
+const char kCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
+const char kCategoryFrame[] =
     TRACE_DISABLED_BY_DEFAULT("devtools.timeline.frame");
-extern const char kData[] = "data";
-extern const char kFrameId[] = "frameId";
-extern const char kLayerId[] = "layerId";
-extern const char kLayerTreeId[] = "layerTreeId";
-extern const char kPixelRefId[] = "pixelRefId";
+const char kData[] = "data";
+const char kFrameId[] = "frameId";
+const char kLayerId[] = "layerId";
+const char kLayerTreeId[] = "layerTreeId";
+const char kPixelRefId[] = "pixelRefId";
 
-extern const char kImageDecodeTask[] = "ImageDecodeTask";
-extern const char kBeginFrame[] = "BeginFrame";
-extern const char kNeedsBeginFrameChanged[] = "NeedsBeginFrameChanged";
-extern const char kActivateLayerTree[] = "ActivateLayerTree";
-extern const char kRequestMainThreadFrame[] = "RequestMainThreadFrame";
-extern const char kBeginMainThreadFrame[] = "BeginMainThreadFrame";
-extern const char kDrawFrame[] = "DrawFrame";
-extern const char kCompositeLayers[] = "CompositeLayers";
+const char kImageDecodeTask[] = "ImageDecodeTask";
+const char kBeginFrame[] = "BeginFrame";
+const char kNeedsBeginFrameChanged[] = "NeedsBeginFrameChanged";
+const char kActivateLayerTree[] = "ActivateLayerTree";
+const char kRequestMainThreadFrame[] = "RequestMainThreadFrame";
+const char kBeginMainThreadFrame[] = "BeginMainThreadFrame";
+const char kDrawFrame[] = "DrawFrame";
+const char kCompositeLayers[] = "CompositeLayers";
 }  // namespace internal
 
-extern const char kPaintSetup[] = "PaintSetup";
-extern const char kUpdateLayer[] = "UpdateLayer";
+const char kPaintSetup[] = "PaintSetup";
+const char kUpdateLayer[] = "UpdateLayer";
 
 ScopedImageDecodeTask::ScopedImageDecodeTask(const void* image_ptr,
                                              DecodeType decode_type,

components/arc/arc_prefs.cc

@@ -47,7 +47,7 @@ const char kArcSetNotificationsEnabledDeferred[] =
 const char kArcSignedIn[] = "arc.signedin";
 // A preference that indicates an ARC comaptible filesystem was chosen for
 // the user directory (i.e., the user finished required migration.)
-extern const char kArcCompatibleFilesystemChosen[] =
+const char kArcCompatibleFilesystemChosen[] =
     "arc.compatible_filesystem.chosen";
 // A preference that indicates that user accepted Voice Interaction Value Prop.
 const char kArcVoiceInteractionValuePropAccepted[] =

components/component_updater/configurator_impl.cc

@@ -43,7 +43,7 @@ const char kSwitchRequestParam[] = "test-request";
 
 // Disables pings. Pings are the requests sent to the update server that report
 // the success or the failure of component install or update attempts.
-extern const char kSwitchDisablePings[] = "disable-pings";
+const char kSwitchDisablePings[] = "disable-pings";
 
 // Sets the URL for updates.
 const char kSwitchUrlSource[] = "url-source";

components/cryptauth/pref_names.cc

@@ -39,19 +39,18 @@ const char kCryptAuthEnrollmentLastEnrollmentTimeSeconds[] =
 // The reason that the next enrollment is performed. This should be one of the
 // enum values of InvocationReason in
 // components/cryptauth/proto/cryptauth_api.proto.
-extern const char kCryptAuthEnrollmentReason[] = "cryptauth.enrollment.reason";
+const char kCryptAuthEnrollmentReason[] = "cryptauth.enrollment.reason";
 
 // The public key of the user and device enrolled with CryptAuth.
-extern const char kCryptAuthEnrollmentUserPublicKey[] =
+const char kCryptAuthEnrollmentUserPublicKey[] =
     "cryptauth.enrollment.user_public_key";
 
 // The private key of the user and device enrolled with CryptAuth.
-extern const char kCryptAuthEnrollmentUserPrivateKey[] =
+const char kCryptAuthEnrollmentUserPrivateKey[] =
     "cryptauth.enrollment.user_private_key";
 
 // The GCM registration id used for receiving push messages from CryptAuth.
-extern const char kCryptAuthGCMRegistrationId[] =
-    "cryptauth.gcm_registration_id";
+const char kCryptAuthGCMRegistrationId[] = "cryptauth.gcm_registration_id";
 
 }  // namespace prefs
 }  // namespace cryptauth

components/metrics/metrics_log.cc

@@ -45,12 +45,6 @@ using base::SampleCountIterator;
 
 namespace metrics {
 
-namespace internal {
-// Maximum number of events before truncation.
-extern const int kOmniboxEventLimit = 5000;
-extern const int kUserActionEventLimit = 5000;
-}
-
 namespace {
 
 // A simple class to write histogram data to a log.

components/metrics/metrics_log.h

@@ -27,15 +27,16 @@ class HistogramSamples;
 
 namespace metrics {
 
-namespace internal {
-extern const int kOmniboxEventLimit;
-extern const int kUserActionEventLimit;
-}
-
 class MetricsProvider;
 class MetricsServiceClient;
 class DelegatingProvider;
 
+namespace internal {
+// Maximum number of events before truncation.
+constexpr int kOmniboxEventLimit = 5000;
+constexpr int kUserActionEventLimit = 5000;
+}  // namespace internal
+
 class MetricsLog {
  public:
   enum LogType {

components/ntp_tiles/constants.cc

@@ -12,13 +12,13 @@ namespace ntp_tiles {
 
 const char kPopularSitesFieldTrialName[] = "NTPPopularSites";
 
-extern const base::Feature kPopularSitesBakedInContentFeature{
+const base::Feature kPopularSitesBakedInContentFeature{
     "NTPPopularSitesBakedInContent", base::FEATURE_ENABLED_BY_DEFAULT};
 
-extern const base::Feature kNtpMostLikelyFaviconsFromServerFeature{
+const base::Feature kNtpMostLikelyFaviconsFromServerFeature{
     "NTPMostLikelyFaviconsFromServer", base::FEATURE_ENABLED_BY_DEFAULT};
 
-extern const base::Feature kSiteExplorationUiFeature{
+const base::Feature kSiteExplorationUiFeature{
     "SiteExplorationUi", base::FEATURE_DISABLED_BY_DEFAULT};
 
 bool AreNtpMostLikelyFaviconsFromServerEnabled() {

components/offline_pages/core/offline_event_logger.cc

@@ -8,8 +8,6 @@
 
 namespace offline_pages {
 
-extern const size_t kMaxLogCount = 50;
-
 OfflineEventLogger::OfflineEventLogger()
     : activities_(0), is_logging_(false), client_(nullptr) {}
 

components/offline_pages/core/offline_event_logger.h

@@ -13,9 +13,8 @@
 
 namespace offline_pages {
 
-// Maximum number of recorded Logs to keep track of at any moment. Defined in
-// offline_event_logger.cc.
-extern const size_t kMaxLogCount;
+// Maximum number of recorded Logs to keep track of at any moment.
+constexpr size_t kMaxLogCount = 50;
 
 // Facilitates the logging of events. Subclasses should create methods that
 // call RecordActivity to write into the log. |SetIsLogging|, |GetLogs|, and
@@ -34,7 +33,7 @@ class OfflineEventLogger {
   // to the event logger instance.
   class Client {
    public:
-    virtual ~Client(){};
+    virtual ~Client() {}
     virtual void CustomLog(const std::string& message) = 0;
   };
 

components/password_manager/core/common/password_manager_features.cc

@@ -48,19 +48,19 @@ const base::Feature kEnablePasswordForceSaving = {
     "enable-password-force-saving", base::FEATURE_DISABLED_BY_DEFAULT};
 
 // Enable the user to trigger password generation manually.
-extern const base::Feature kEnableManualPasswordGeneration = {
+const base::Feature kEnableManualPasswordGeneration = {
     "enable-manual-password-generation", base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables username correction while saving username and password details.
-extern const base::Feature kEnableUsernameCorrection{
-    "EnableUsernameCorrection", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kEnableUsernameCorrection{"EnableUsernameCorrection",
+                                              base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables password selection while saving username and password details.
-extern const base::Feature kEnablePasswordSelection{
-    "EnablePasswordSelection", base::FEATURE_ENABLED_BY_DEFAULT};
+const base::Feature kEnablePasswordSelection{"EnablePasswordSelection",
+                                             base::FEATURE_ENABLED_BY_DEFAULT};
 
 // Enables the "Show all saved passwords" option in Context Menu.
-extern const base::Feature kEnableShowAllSavedPasswordsContextMenu{
+const base::Feature kEnableShowAllSavedPasswordsContextMenu{
     "kEnableShowAllSavedPasswordsContextMenu",
     base::FEATURE_ENABLED_BY_DEFAULT};
 

components/proximity_auth/proximity_auth_pref_names.cc

@@ -27,7 +27,7 @@ const char kEasyUnlockLocalStateUserPrefs[] = "easy_unlock.user_prefs";
 
 // Whether or not EasyUnlock is enabled on the ChromeOS login screen (in
 // addition to the lock screen).
-extern const char kProximityAuthIsChromeOSLoginEnabled[] =
+const char kProximityAuthIsChromeOSLoginEnabled[] =
     "proximity_auth.is_chromeos_login_enabled";
 
 // The timestamp of the last password entry in milliseconds, used to enforce
@@ -40,7 +40,7 @@ const char kProximityAuthLastPromotionCheckTimestampMs[] =
     "proximity_auth.last_promotion_check_timestamp_ms";
 
 // The number of times the promotion was shown to the user.
-extern const char kProximityAuthPromotionShownCount[] =
+const char kProximityAuthPromotionShownCount[] =
     "proximity_auth.promotion_shown_count";
 
 // The dictionary containing remote BLE devices.

components/safe_browsing/web_ui/constants.cc

@@ -10,11 +10,11 @@ const char kChromeUISafeBrowsingURL[] = "chrome://safe-browsing/";
 const char kChromeUISafeBrowsingHost[] = "safe-browsing";
 const char kSbUnderConstruction[] =
     "The safe browsing page is under construction.";
-extern const char kChromeUISafeBrowsingMatchMalwareUrl[] =
+const char kChromeUISafeBrowsingMatchMalwareUrl[] =
     "chrome://safe-browsing/match?type=malware";
-extern const char kChromeUISafeBrowsingMatchPhishingUrl[] =
+const char kChromeUISafeBrowsingMatchPhishingUrl[] =
     "chrome://safe-browsing/match?type=phishing";
-extern const char kChromeUISafeBrowsingMatchUnwantedUrl[] =
+const char kChromeUISafeBrowsingMatchUnwantedUrl[] =
     "chrome://safe-browsing/match?type=unwanted";
 
 }  // namespace safe_browsing

components/signin/core/browser/signin_switches.cc

@@ -27,7 +27,7 @@ const char kAccountConsistencyDice[] = "dice";
 #endif
 
 // Enables sending EnableRefreshTokenAnnotationRequest.
-extern const char kEnableRefreshTokenAnnotationRequest[] =
+const char kEnableRefreshTokenAnnotationRequest[] =
     "enable-refresh-token-annotation-request";
 
 // Enables multiple account versions of chrome.identity APIs.

content/public/common/content_switches.cc

@@ -94,7 +94,7 @@ const char kDisableBackingStoreLimit[]      = "disable-backing-store-limit";
 
 // Disable backgrounding renders for occluded windows. Done for tests to avoid
 // nondeterministic behavior.
-extern const char kDisableBackgroundingOccludedWindowsForTesting[] =
+const char kDisableBackgroundingOccludedWindowsForTesting[] =
     "disable-backgrounding-occluded-windows";
 
 // Disable task throttling of timer tasks from background pages.

extensions/browser/guest_view/extension_options/extension_options_constants.cc

@@ -7,7 +7,7 @@
 namespace extensionoptions {
 
 // API namespace.
-extern const char kAPINamespace[] = "extensionOptionsInternal";
+const char kAPINamespace[] = "extensionOptionsInternal";
 
 const char kExtensionId[] = "extension";
 

extensions/browser/guest_view/extension_view/extension_view_constants.cc

@@ -7,7 +7,7 @@
 namespace extensionview {
 
 // API namespace.
-extern const char kAPINamespace[] = "extensionViewInternal";
+const char kAPINamespace[] = "extensionViewInternal";
 
 // Attributes.
 const char kAttributeExtension[] = "extension";

ios/chrome/browser/ios_chrome_flag_descriptions.cc

@@ -91,9 +91,8 @@ const char kPropertyAnimationsToolbarDescription[] =
     "When enabled, Toolbar animations will be done using "
     "UIViewPropertyAnimator";
 
-extern const char kSafeAreaCompatibleToolbarName[] =
-    "Safe Area Compatible Toolbar";
-extern const char kSafeAreaCompatibleToolbarDescription[] =
+const char kSafeAreaCompatibleToolbarName[] = "Safe Area Compatible Toolbar";
+const char kSafeAreaCompatibleToolbarDescription[] =
     "When enabled, the toolbar resizes itself when the safe area changes.";
 
 const char kShareCanonicalURLName[] = "Share Canonical URL";

ios/chrome/browser/ui/toolbar/public/toolbar_controller_base_feature.mm

@@ -8,7 +8,7 @@
 #error "This file requires ARC support."
 #endif
 
-extern const base::Feature kPropertyAnimationsToolbar{
+const base::Feature kPropertyAnimationsToolbar{
     "PropertyAnimationsToolbar", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kCleanToolbar{"CleanToolbar",

mojo/edk/system/ports/name.cc

@@ -8,9 +8,9 @@ namespace mojo {
 namespace edk {
 namespace ports {
 
-extern const PortName kInvalidPortName = {0, 0};
+const PortName kInvalidPortName = {0, 0};
 
-extern const NodeName kInvalidNodeName = {0, 0};
+const NodeName kInvalidNodeName = {0, 0};
 
 std::ostream& operator<<(std::ostream& stream, const Name& name) {
   std::ios::fmtflags flags(stream.flags());