Enable SDCH on mac/linux

Although it compiles in all builds etc., someone left the enabling code
ifdef'ed in browser main. This should enable SDCH on mac/linux.

To test, visit a site that supports SDCH (twice... the first time
you'll get the dictionary in the background), and then do a
view-cache:
in front of the resulting URL, and check to see that you're getting
Content-Encoding: sdch,gzip
If it is not sdch encoded, then with some tiny (1%) probability, 
you're in a control group of a current experiment... and you can
try starting your browser again... and doing another two visits.

To better track the issue if you think you are in the control group,
you can also visit
about:histograms
and you should see that a dictionary was downloaded, and then
either some content was decoded, with timings in Sdch3.Experiment_Decode
or was not run in SDCH and was timed in Sdch3.Experiment_Holdback.

BUG=14516

r=willchan,pinkerton
Review URL: http://codereview.chromium.org/131025

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

1 files changed, 1 insertions, 3 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 4eb094f..bfd77da 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/net/dns_global.h"
+#include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profile_manager.h"
@@ -88,7 +89,6 @@
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile.h"
@@ -736,7 +736,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
   // Have Chrome plugins write their data to the profile directory.
   PluginService::GetInstance()->SetChromePluginDataDir(profile->GetPath());
 
-#if defined(OS_WIN)
   // Prepare for memory caching of SDCH dictionaries.
   SdchManager sdch_manager;  // Construct singleton database.
   sdch_manager.set_sdch_fetcher(new SdchDictionaryFetcher);
@@ -747,7 +746,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
         WideToASCII(parsed_command_line.GetSwitchValue(switches::kSdchFilter));
   }
   sdch_manager.EnableSdchSupport(switch_domain);
-#endif
 
   MetricsService* metrics = NULL;
   if (!parsed_command_line.HasSwitch(switches::kDisableMetrics)) {