Revert 226921 "Don't pull in content_switches.cc to whole chrome..."

Likely increased mac binary size by 36 MB (crbug.com/304153)

> Don't pull in content_switches.cc to whole chrome code base
> 
> The point of this change is remove compilation of content_switches.cc
> that was done in installer_util target. This is a static library
> that other parts of chrome pull in and that makes the Chrome code that
> references those switches compile even if the switches itself are
> not exported.
> Installer_util doesn't even seem to uses those switches AFAIK.
> 
> Dropped compilation of these files so these problems are actually
> exposed and addressed by the person adding the switch. The main
> offender that referenced those switches was chrome's about_flags.cc.
> 
> BUG=
> 
> Review URL: https://codereview.chromium.org/24994002

TBR=rchlodnicki@opera.com

Review URL: https://codereview.chromium.org/26006005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227028 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 49 insertions, 35 deletions

diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 6cb2f9e..ae000d7 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -26,8 +26,7 @@
         'app/hard_error_handler_win.h',
         'app/metro_driver_win.cc',
         'app/metro_driver_win.h',
-        '<(DEPTH)/content/app/startup_helper_win.cc',
-        '<(DEPTH)/content/public/common/content_switches.cc',
+        '../content/app/startup_helper_win.cc',
       ],
       'mac_bundle_resources': [
         'app/app-Info.plist',
diff --git a/chrome/chrome_installer_util.gypi b/chrome/chrome_installer_util.gypi
index 31c3653..1777308 100644
--- a/chrome/chrome_installer_util.gypi
+++ b/chrome/chrome_installer_util.gypi
@@ -112,6 +112,7 @@
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
             '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+            '<(DEPTH)/content/content.gyp:content_common',
             '<(DEPTH)/courgette/courgette.gyp:courgette_lib',
             '<(DEPTH)/crypto/crypto.gyp:crypto',
             '<(DEPTH)/third_party/bspatch/bspatch.gyp:bspatch',
@@ -160,6 +161,14 @@
             'installer/util/user_experiment.cc',
             'installer/util/user_experiment.h',
           ],
+          'conditions': [
+            ['component=="shared_library"', {
+              'sources': [ '../content/public/common/content_switches.cc' ],
+              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
+            }, {
+              'dependencies': ['<(DEPTH)/content/content.gyp:content_common'],
+            }],
+          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         },
@@ -201,6 +210,7 @@
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
             '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
+            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
           ],
           'sources': [
             'installer/util/google_update_experiment_util.cc',
@@ -213,6 +223,12 @@
           'include_dirs': [
             '<(DEPTH)',
           ],
+          'conditions': [
+            ['component == "shared_library"', {
+              'sources': [ '../content/public/common/content_switches.cc' ],
+              'defines': [ 'COMPILE_CONTENT_STATICALLY'],
+            }],
+          ],
         }
       ],
     }],
diff --git a/chrome/common_constants.gyp b/chrome/common_constants.gyp
index 018a817..3cb4843d 100644
--- a/chrome/common_constants.gyp
+++ b/chrome/common_constants.gyp
@@ -71,7 +71,6 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../components/nacl_common.gyp:nacl_switches',
-        '../content/content.gyp:content_common',
         '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
       ],
       'target_conditions': [
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index 95ad7ae..93c3f99 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -18,7 +18,7 @@ CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[];
 CONTENT_EXPORT extern const char kAllowFiltersOverIPC[];
 CONTENT_EXPORT extern const char kAllowNoSandboxJob[];
 extern const char kAllowSandboxDebugging[];
-CONTENT_EXPORT extern const char kAllowWebUICompositing[];
+extern const char kAllowWebUICompositing[];
 extern const char kAuditAllHandles[];
 extern const char kAuditHandles[];
 CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];
@@ -36,7 +36,7 @@ CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
 CONTENT_EXPORT extern const char kDisableAcceleratedCompositing[];
 CONTENT_EXPORT extern const char kDisableAcceleratedFixedRootBackground[];
 CONTENT_EXPORT extern const char kDisableAcceleratedLayers[];
-CONTENT_EXPORT extern const char kDisableAcceleratedOverflowScroll[];
+extern const char kDisableAcceleratedOverflowScroll[];
 CONTENT_EXPORT extern const char kDisableAcceleratedPlugins[];
 CONTENT_EXPORT extern const char kDisableAcceleratedVideo[];
 CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
@@ -67,43 +67,43 @@ CONTENT_EXPORT extern const char kDisableGLMultisampling[];
 extern const char kDisableGpu[];
 CONTENT_EXPORT extern const char kDisableGpuCompositing[];
 CONTENT_EXPORT extern const char kDisableGpuProcessPrelaunch[];
-CONTENT_EXPORT extern const char kDisableGpuSandbox[];
-CONTENT_EXPORT extern const char kDisableGpuWatchdog[];
+extern const char kDisableGpuSandbox[];
+extern const char kDisableGpuWatchdog[];
 CONTENT_EXPORT extern const char kDisableHangMonitor[];
 extern const char kDisableHistogramCustomizer[];
 CONTENT_EXPORT extern const char kDisableHTMLNotifications[];
 extern const char kDisableImageTransportSurface[];
 CONTENT_EXPORT extern const char kDisableJava[];
 CONTENT_EXPORT extern const char kDisableJavaScript[];
-CONTENT_EXPORT extern const char kDisablePrefixedEncryptedMedia[];
+extern const char kDisablePrefixedEncryptedMedia[];
 CONTENT_EXPORT extern const char kDisableLocalStorage[];
 CONTENT_EXPORT extern const char kDisableLogging[];
 extern const char kDisablePepper3d[];
-CONTENT_EXPORT extern const char kDisablePinch[];
+extern const char kDisablePinch[];
 CONTENT_EXPORT extern const char kDisablePlugins[];
 CONTENT_EXPORT extern const char kDisablePluginsDiscovery[];
 extern const char kDisableRemoteFonts[];
 extern const char kDisableRendererAccessibility[];
-CONTENT_EXPORT extern const char kDisableSeccompFilterSandbox[];
+extern const char kDisableSeccompFilterSandbox[];
 extern const char kDisableSessionStorage[];
-CONTENT_EXPORT extern const char kDisableSetuidSandbox[];
+extern const char kDisableSetuidSandbox[];
 CONTENT_EXPORT extern const char kDisableSharedWorkers[];
 extern const char kDisableSiteSpecificQuirks[];
 CONTENT_EXPORT extern const char kDisableSmoothScrolling[];
 CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[];
 CONTENT_EXPORT extern const char kDisableSpeechInput[];
-CONTENT_EXPORT extern const char kDisableSSLFalseStart[];
+extern const char kDisableSSLFalseStart[];
 CONTENT_EXPORT extern const char kDisableThreadedCompositing[];
 CONTENT_EXPORT extern const char kDisableThreadedHTMLParser[];
 CONTENT_EXPORT extern const char kDisableWebAudio[];
-CONTENT_EXPORT extern const char kDisableWebKitMediaSource[];
+extern const char kDisableWebKitMediaSource[];
 CONTENT_EXPORT extern const char kDisableWebSecurity[];
 extern const char kDisableXSLT[];
 extern const char kDisableXSSAuditor[];
 CONTENT_EXPORT extern const char kDomAutomationController[];
 CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
 CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
-CONTENT_EXPORT extern const char kEnableAcceleratedOverflowScroll[];
+extern const char kEnableAcceleratedOverflowScroll[];
 extern const char kEnableAcceleratedScrollableFrames[];
 extern const char kEnableAccessibilityLogging[];
 extern const char kEnableAudibleNotifications[];
@@ -118,10 +118,10 @@ CONTENT_EXPORT extern const char kEnableDeferredImageDecoding[];
 CONTENT_EXPORT extern const char kEnableDeadlineScheduling[];
 CONTENT_EXPORT extern const char kEnableDelegatedRenderer[];
 CONTENT_EXPORT extern const char kEnableDownloadResumption[];
-CONTENT_EXPORT extern const char kEnableEncryptedMedia[];
+extern const char kEnableEncryptedMedia[];
 CONTENT_EXPORT extern const char kEnableExperimentalCanvasFeatures[];
 CONTENT_EXPORT extern const char kEnableExperimentalWebPlatformFeatures[];
-CONTENT_EXPORT extern const char kEnableExperimentalWebSocket[];
+extern const char kEnableExperimentalWebSocket[];
 extern const char kEnableFastTextAutosizing[];
 CONTENT_EXPORT extern const char kEnableFixedLayout[];
 CONTENT_EXPORT extern const char kEnableFixedPositionCreatesStackingContext[];
@@ -130,9 +130,9 @@ extern const char kEnableGpuBenchmarking[];
 extern const char kEnableGpuClientTracing[];
 CONTENT_EXPORT extern const char kEnableHighDpiCompositingForFixedPosition[];
  #if defined(OS_WIN)
-CONTENT_EXPORT extern const char kEnableHighResolutionTime[];
+extern const char kEnableHighResolutionTime[];
 #endif
-CONTENT_EXPORT extern const char kEnableHTMLImports[];
+extern const char kEnableHTMLImports[];
 CONTENT_EXPORT extern const char kEnableInbandTextTracks[];
 extern const char kEnableInputModeAttribute[];
 CONTENT_EXPORT extern const char kEnableLogging[];
@@ -140,14 +140,14 @@ extern const char kEnableMemoryBenchmarking[];
 extern const char kEnableMonitorProfile[];
 CONTENT_EXPORT extern const char kEnableOfflineCacheAccess[];
 CONTENT_EXPORT extern const char kEnableOverlayFullscreenVideo[];
-CONTENT_EXPORT extern const char kEnableOverlayScrollbars[];
+extern const char kEnableOverlayScrollbars[];
 CONTENT_EXPORT extern const char kEnableOverscrollNotifications[];
-CONTENT_EXPORT extern const char kEnablePinch[];
+extern const char kEnablePinch[];
 extern const char kEnablePreparsedJsCaching[];
 CONTENT_EXPORT extern const char kEnablePrivilegedWebGLExtensions[];
 extern const char kEnablePruneGpuCommandBuffers[];
 CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
-CONTENT_EXPORT extern const char kEnableSandboxLogging[];
+extern const char kEnableSandboxLogging[];
 extern const char kEnableSkiaBenchmarking[];
 CONTENT_EXPORT extern const char kEnableSmoothScrolling[];
 CONTENT_EXPORT extern const char kEnableSoftwareCompositing[];
@@ -159,25 +159,25 @@ extern const char kEnableStrictSiteIsolation[];
 CONTENT_EXPORT extern const char kEnableTcpFastOpen[];
 CONTENT_EXPORT extern const char kEnableTextServicesFramework[];
 CONTENT_EXPORT extern const char kEnableThreadedCompositing[];
-CONTENT_EXPORT extern const char kEnableUserMediaScreenCapturing[];
-CONTENT_EXPORT extern const char kEnableViewport[];
+extern const char kEnableUserMediaScreenCapturing[];
+extern const char kEnableViewport[];
 extern const char kEnableVisualWordMovement[];
 CONTENT_EXPORT extern const char kEnableVtune[];
 extern const char kEnableWebAnimationsCSS[];
 extern const char kEnableWebAnimationsSVG[];
 CONTENT_EXPORT extern const char kEnableWebGLDraftExtensions[];
-CONTENT_EXPORT extern const char kEnableWebMIDI[];
+extern const char kEnableWebMIDI[];
 CONTENT_EXPORT extern const char kExtraPluginDir[];
 CONTENT_EXPORT extern const char kForceCompositingMode[];
-CONTENT_EXPORT extern const char kForceFieldTrials[];
+extern const char kForceFieldTrials[];
 CONTENT_EXPORT extern const char kForceRendererAccessibility[];
 extern const char kGpuDeviceID[];
 extern const char kGpuDriverVendor[];
 extern const char kGpuDriverVersion[];
 extern const char kGpuLauncher[];
 CONTENT_EXPORT extern const char kGpuProcess[];
-CONTENT_EXPORT extern const char kGpuSandboxAllowSysVShm[];
-CONTENT_EXPORT extern const char kGpuStartupDialog[];
+extern const char kGpuSandboxAllowSysVShm[];
+extern const char kGpuStartupDialog[];
 extern const char kGpuVendorID[];
 CONTENT_EXPORT extern const char kHostResolverRules[];
 CONTENT_EXPORT extern const char kIgnoreCertificateErrors[];
@@ -202,7 +202,7 @@ CONTENT_EXPORT extern const char kPluginPath[];
 CONTENT_EXPORT extern const char kPluginProcess[];
 extern const char kPluginStartupDialog[];
 CONTENT_EXPORT extern const char kPpapiBrokerProcess[];
-CONTENT_EXPORT extern const char kPpapiFlashArgs[];
+extern const char kPpapiFlashArgs[];
 CONTENT_EXPORT extern const char kPpapiInProcess[];
 extern const char kPpapiPluginLauncher[];
 CONTENT_EXPORT extern const char kPpapiPluginProcess[];
@@ -216,8 +216,8 @@ CONTENT_EXPORT extern const char kRemoteDebuggingPort[];
 CONTENT_EXPORT extern const char kRendererAssertTest[];
 extern const char kRendererCmdPrefix[];
 CONTENT_EXPORT extern const char kRendererProcess[];
-CONTENT_EXPORT extern const char kRendererProcessLimit[];
-CONTENT_EXPORT extern const char kRendererStartupDialog[];
+extern const char kRendererProcessLimit[];
+extern const char kRendererStartupDialog[];
 extern const char kSandboxIPCProcess[];
 CONTENT_EXPORT extern const char kScrollEndEffect[];
 extern const char kShowPaintRects[];
@@ -227,8 +227,8 @@ CONTENT_EXPORT extern const char kSitePerProcess[];
 CONTENT_EXPORT extern const char kSkipGpuDataLoading[];
 extern const char kSpeechRecognitionWebserviceKey[];
 CONTENT_EXPORT extern const char kStatsCollectionController[];
-CONTENT_EXPORT extern const char kTabCaptureDownscaleQuality[];
-CONTENT_EXPORT extern const char kTabCaptureUpscaleQuality[];
+extern const char kTabCaptureDownscaleQuality[];
+extern const char kTabCaptureUpscaleQuality[];
 extern const char kTapDownDeferralTimeMs[];
 CONTENT_EXPORT extern const char kTestingFixedHttpPort[];
 CONTENT_EXPORT extern const char kTestingFixedHttpsPort[];
@@ -258,10 +258,10 @@ CONTENT_EXPORT extern const char kZygoteProcess[];
 CONTENT_EXPORT extern const char kDisableDeviceEnumeration[];
 CONTENT_EXPORT extern const char kDisableSCTPDataChannels[];
 CONTENT_EXPORT extern const char kDisableWebRtcHWDecoding[];
-CONTENT_EXPORT extern const char kDisableWebRtcHWEncoding[];
+extern const char kDisableWebRtcHWEncoding[];
 extern const char kEnableWebRtcAecRecordings[];
 extern const char kEnableWebRtcTcpServerSocket[];
-CONTENT_EXPORT extern const char kEnableWebRtcHWVp8Encoding[];
+extern const char kEnableWebRtcHWVp8Encoding[];
 #endif
 
 #if defined(OS_ANDROID)
@@ -283,7 +283,7 @@ CONTENT_EXPORT extern const char kDisablePanelFitting[];
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 extern const char kDisableCarbonInterposing[];
 extern const char kDisableCoreAnimationPlugins[];
-CONTENT_EXPORT extern const char kUseCoreAnimation[];
+extern const char kUseCoreAnimation[];
 #endif
 
 #if defined(OS_POSIX)