Enable filesystem: URIs by default and remove enabling switch.

The filesystem: generation and resolution methods have now been
added to WebKit, so Chrome should be able to load those URIs.

BUG=74858
TEST=none

Review URL: http://codereview.chromium.org/6612032

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

3 files changed, 1 insertions, 7 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 7c3ce0f..5206a98 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1584,9 +1584,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
   RegisterExtensionProtocols();
   RegisterMetadataURLRequestHandler();
   RegisterBlobURLRequestJobFactory();
-
-  if (parsed_command_line.HasSwitch(switches::kEnableFileSystemURLScheme))
-    RegisterFileSystemURLRequestJobFactory();
+  RegisterFileSystemURLRequestJobFactory();
 
   // In unittest mode, this will do nothing.  In normal mode, this will create
   // the global GoogleURLTracker and IntranetRedirectDetector instances, which
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 079335a..dc91d8d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -492,9 +492,6 @@ const char kEnableFileCookies[]             = "enable-file-cookies";
 // Enable the use of the HistoryQuickProvider for autocomplete results.
 const char kEnableHistoryQuickProvider[]    = "enable-history-quick-provider";
 
-// Enable FileSystem API URLs.
-const char kEnableFileSystemURLScheme[]     = "enable-filesystem-url-scheme";
-
 // Enable the in-browser thumbnailing, which is more efficient than the
 // in-renderer thumbnailing, as we can use more information to determine
 // if we need to update thumbnails.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1fd8a08..ab3175c 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -146,7 +146,6 @@ extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
-extern const char kEnableFileSystemURLScheme[];
 extern const char kEnableHistoryQuickProvider[];
 extern const char kEnableInBrowserThumbnailing[];
 extern const char kEnableIPv6[];