Files.app: Remove support for chrome://files.

Files.app has supported chrome://files URL, but it is no longer needed.
This CL removes the support and the related tests.

BUG=288447
TEST=manually

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

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

11 files changed, 2 insertions, 79 deletions

diff --git a/chrome/browser/chromeos/file_manager/url_util.cc b/chrome/browser/chromeos/file_manager/url_util.cc
index fecf759..ff703e8 100644
--- a/chrome/browser/chromeos/file_manager/url_util.cc
+++ b/chrome/browser/chromeos/file_manager/url_util.cc
@@ -113,8 +113,6 @@ GURL GetFileManagerMainPageUrlWithParams(
   std::string json_args;
   base::JSONWriter::Write(&arg_value, &json_args);
 
-  // kChromeUIFileManagerURL could not be used since query parameters are not
-  // supported for it.
   std::string url = GetFileManagerMainPageUrl().spec() + '?' +
       net::EscapeUrlEncodedData(json_args,
                                 false);  // Space to %20 instead of +.
diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
index 0db2dcb..6dc93f0 100644
--- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
+++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
@@ -111,14 +111,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, MAYBE_BookmarksURL) {
   EXPECT_TRUE(navigation->GetURL().SchemeIs(extensions::kExtensionScheme));
 }
 
-#if defined(FILE_MANAGER_EXTENSION)
-IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, FileManagerURL) {
-  // Navigate to chrome://files and check that the location bar URL is
-  // what was entered and the internal URL uses the chrome-extension:// scheme.
-  TestExtensionURLOverride(GURL(chrome::kChromeUIFileManagerURL));
-}
-#endif
-
 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLWithRef) {
   // Navigate to chrome://bookmarks/#1 and check that the location bar URL is
   // what was entered and the internal URL uses the chrome-extension:// scheme.
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 25008e9..d888cd3 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -481,10 +481,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
   };
 
   FileManager.prototype.onMaximize = function() {
-    // Do not maximize when running via chrome://files in a browser.
-    if (util.platform.runningInBrowser())
-      return;
-
     var appWindow = chrome.app.window.current();
     if (appWindow.isMaximized())
       appWindow.restore();
@@ -493,10 +489,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
   };
 
   FileManager.prototype.onClose = function() {
-    // Do not close when running via chrome://files in a browser.
-    if (util.platform.runningInBrowser())
-      return;
-
     window.close();
   };
 
diff --git a/chrome/browser/resources/file_manager/js/util.js b/chrome/browser/resources/file_manager/js/util.js
index 5e1c449..9f6e88f 100644
--- a/chrome/browser/resources/file_manager/js/util.js
+++ b/chrome/browser/resources/file_manager/js/util.js
@@ -725,8 +725,8 @@ function strf(id, var_args) {
  */
 util.platform = {
   /**
-   * @return {boolean} True if Files.app is running via "chrome://files", open
-   * files or select folder dialog. False otherwise.
+   * @return {boolean} True if Files.app is running as an open files or a select
+   *     folder dialog. False otherwise.
    */
   runningInBrowser: function() {
     return !window.appID;
diff --git a/chrome/browser/resources/file_manager/manifest.json b/chrome/browser/resources/file_manager/manifest.json
index 9c52de7..5222c4e 100644
--- a/chrome/browser/resources/file_manager/manifest.json
+++ b/chrome/browser/resources/file_manager/manifest.json
@@ -213,9 +213,6 @@
       "file_filters": []
     }
   ],
-  "chrome_url_overrides": {
-    "files": "main.html"
-  },
   // Required to import scripts in a web worker. Note, that in Apps v2, it is
   // enough that anything is passed to web_accessible_resources. If there is
   // at least any file, then all files are allowed. http://crbug.com/179127.
diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
index 6e926f7..1ce1ac7 100644
--- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
+++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler_manifest_unittest.cc
@@ -149,29 +149,4 @@ TEST_F(FileBrowserHandlerManifestTest, ValidFileBrowserHandlerWithCreate) {
   EXPECT_FALSE(action->CanWrite());
 }
 
-TEST_F(FileBrowserHandlerManifestTest, FileManagerURLOverride) {
-  scoped_ptr<DictionaryValue> manifest_value =
-      DictionaryBuilder()
-          .Set("name", "override_files")
-          .Set("version", "1.0.0")
-          .Set("manifest_version", 2)
-          .Set("chrome_url_overrides", DictionaryBuilder()
-              .Set("files", "main.html"))
-      .Build();
-
-  // Non component extensions can't override chrome://files/ URL.
-  LoadAndExpectError(Manifest(manifest_value.get(), "override_files"),
-                     errors::kInvalidChromeURLOverrides);
-
-  // A component extension can override chrome://files/ URL.
-  std::string error;
-  LoadExtension(Manifest(manifest_value.get(), "override_files"),
-                &error, extensions::Manifest::COMPONENT, Extension::NO_FLAGS);
-#if defined(FILE_MANAGER_EXTENSION)
-  EXPECT_EQ("", error);
-#else
-  EXPECT_EQ(std::string(errors::kInvalidChromeURLOverrides), error);
-#endif
-}
-
 }  // namespace
diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc
index 1e3e349..24fbafa 100644
--- a/chrome/common/extensions/manifest_url_handler.cc
+++ b/chrome/common/extensions/manifest_url_handler.cc
@@ -281,11 +281,6 @@ bool URLOverridesHandler::Parse(Extension* extension, string16* error) {
     is_override = (is_override &&
                    page != chrome::kChromeUIActivationMessageHost);
 #endif
-#if defined(FILE_MANAGER_EXTENSION)
-    is_override = (is_override &&
-                   !(extension->location() == Manifest::COMPONENT &&
-                     page == chrome::kChromeUIFileManagerHost));
-#endif
 #if defined(OS_CHROMEOS)
     is_override = (is_override && page != keyboard::kKeyboardWebUIHost);
 #endif
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index c7ccd2b..fc4c094 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -119,10 +119,6 @@ const char kChromeUITermsOemURL[] = "chrome://terms/oem";
 const char kChromeUIUserImageURL[] = "chrome://userimage/";
 #endif
 
-#if defined(FILE_MANAGER_EXTENSION)
-const char kChromeUIFileManagerURL[] = "chrome://files/";
-#endif
-
 #if defined(USE_AURA)
 const char kChromeUIGestureConfigURL[] = "chrome://gesture/";
 const char kChromeUIGestureConfigHost[] = "gesture";
@@ -284,10 +280,6 @@ const char kOnlineEulaURLPath[] =
     "https://www.google.com/intl/%s/chrome/eula_text.html";
 #endif
 
-#if defined(FILE_MANAGER_EXTENSION)
-const char kChromeUIFileManagerHost[] = "files";
-#endif
-
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
 const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
 #endif
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index bd6f0e8..172d09b 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -113,10 +113,6 @@ extern const char kChromeUITermsOemURL[];
 extern const char kChromeUIUserImageURL[];
 #endif
 
-#if defined(FILE_MANAGER_EXTENSION)
-extern const char kChromeUIFileManagerURL[];
-#endif
-
 #if defined(USE_AURA)
 extern const char kChromeUIGestureConfigURL[];
 extern const char kChromeUIGestureConfigHost[];
@@ -275,10 +271,6 @@ extern const char kOemEulaURLPath[];
 extern const char kOnlineEulaURLPath[];
 #endif
 
-#if defined(FILE_MANAGER_EXTENSION)
-extern const char kChromeUIFileManagerHost[];
-#endif
-
 #if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
 extern const char kChromeUITabModalConfirmDialogHost[];
 #endif
diff --git a/chrome/test/data/extensions/browsertest/url_rewrite/file_manager/files.html b/chrome/test/data/extensions/browsertest/url_rewrite/file_manager/files.html
deleted file mode 100644
index 47cc438..0000000
--- a/chrome/test/data/extensions/browsertest/url_rewrite/file_manager/files.html
+++ /dev/null
@@ -1 +0,0 @@
-File Manager Override!
diff --git a/chrome/test/data/extensions/browsertest/url_rewrite/file_manager/manifest.json b/chrome/test/data/extensions/browsertest/url_rewrite/file_manager/manifest.json
deleted file mode 100644
index 6bb4608..0000000
--- a/chrome/test/data/extensions/browsertest/url_rewrite/file_manager/manifest.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "File manager override test",
-  "version": "0.1",
-  "manifest_version": 2,
-  "description": "Test chrome://files override",
-  "chrome_url_overrides": {
-    "files": "files.html"
-  }
-}