Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as condition.

BUG=166934

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

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

15 files changed, 21 insertions, 39 deletions

diff --git a/build/common.gypi b/build/common.gypi
index bb64044..dcd8a42 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -274,9 +274,6 @@
       # Note: this setting is ignored if buildtype=="Official".
       'tracing_like_official_build%': 0,
 
-      # Disable file manager component extension by default.
-      'file_manager_extension%': 0,
-
       # Disable image loader component extension by default.
       'image_loader_extension%': 0,
 
@@ -599,12 +596,10 @@
           'use_titlecase_in_grd_files%': 1,
         }],
 
-        # Enable file manager and image loader extensions on Chrome OS.
+        # Enable loader extensions on Chrome OS.
         ['chromeos==1', {
-          'file_manager_extension%': 1,
           'image_loader_extension%': 1,
         }, {
-          'file_manager_extension%': 0,
           'image_loader_extension%': 0,
         }],
 
@@ -904,7 +899,6 @@
     'enable_hidpi%': '<(enable_hidpi)',
     'enable_touch_ui%': '<(enable_touch_ui)',
     'use_xi2_mt%':'<(use_xi2_mt)',
-    'file_manager_extension%': '<(file_manager_extension)',
     'image_loader_extension%': '<(image_loader_extension)',
     'fastbuild%': '<(fastbuild)',
     'dcheck_always_on%': '<(dcheck_always_on)',
@@ -1690,9 +1684,6 @@
       ['use_ozone==1', {
         'grit_defines': ['-D', 'use_ozone'],
       }],
-      ['file_manager_extension==1', {
-        'grit_defines': ['-D', 'file_manager_extension'],
-      }],
       ['image_loader_extension==1', {
         'grit_defines': ['-D', 'image_loader_extension'],
       }],
@@ -2175,9 +2166,6 @@
       ['use_xi2_mt!=0 and use_x11==1', {
         'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
       }],
-      ['file_manager_extension==1', {
-        'defines': ['FILE_MANAGER_EXTENSION=1'],
-      }],
       ['image_loader_extension==1', {
         'defines': ['IMAGE_LOADER_EXTENSION=1'],
       }],
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index f87aca5..91a5be2 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -234,7 +234,7 @@
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_H" file="feedback_hover.png" />
       <structure type="chrome_scaled_image" name="IDR_FEEDBACK_P" file="feedback_pressed.png" />
 
-      <if expr="pp_ifdef('file_manager_extension')">
+      <if expr="pp_ifdef('chromeos')">
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_ARCHIVE" file="cros/file_types/archive.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_AUDIO" file="cros/file_types/audio.png" />
         <structure type="chrome_scaled_image" name="IDR_FILE_MANAGER_IMG_FILETYPE_DRIVE" file="cros/file_types/drive.png" />
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 149e6c3..e6b906c 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -329,7 +329,7 @@
         <include name="IDR_SLOW_JS" file="resources\chromeos\slow.js" type="BINDATA" />
         <include name="IDR_CHARGER_REPLACEMENT_HTML" file="resources\chromeos\charger_replacement.html" flattenhtml="true" type="BINDATA" />
       </if>
-      <if expr="pp_ifdef('file_manager_extension')">
+      <if expr="pp_ifdef('chromeos')">
         <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\manifest.json" type="BINDATA" />
       </if>
       <if expr="pp_ifdef('image_loader_extension')">
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 83026ed..39b3b57 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -210,7 +210,7 @@
 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate_bubble_ui.h"
 #endif
 
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #endif
 
@@ -2314,7 +2314,7 @@ void ChromeContentBrowserClient::OverrideWebkitPrefs(
     web_prefs->accelerated_compositing_enabled = false;
   }
 
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
   // Override the default of suppressing HW compositing for WebUI pages for the
   // file manager, which is implemented using WebUI but wants HW acceleration
   // for video decode & render.
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 89f799e..cae250a 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -272,7 +272,7 @@ bool ComponentLoader::Exists(const std::string& id) const {
 }
 
 void ComponentLoader::AddFileManagerExtension() {
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
 #ifndef NDEBUG
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) {
@@ -284,7 +284,7 @@ void ComponentLoader::AddFileManagerExtension() {
 #endif  // NDEBUG
   Add(IDR_FILEMANAGER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("file_manager")));
-#endif  // defined(FILE_MANAGER_EXTENSION)
+#endif  // defined(OS_CHROMEOS)
 }
 
 void ComponentLoader::AddHangoutServicesExtension() {
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index 07b142e..3a678095 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -139,7 +139,7 @@ TEST_F(ExtensionIconManagerTest, LoadRemoveLoad) {
   EXPECT_TRUE(gfx::BitmapsAreEqual(first_icon, second_icon));
 }
 
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
 // Tests loading an icon for a component extension.
 TEST_F(ExtensionIconManagerTest, LoadComponentExtensionResource) {
   scoped_ptr<Profile> profile(new TestingProfile());
diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/chrome/browser/extensions/image_loader_unittest.cc
index 620448f..9be9dcb 100644
--- a/chrome/browser/extensions/image_loader_unittest.cc
+++ b/chrome/browser/extensions/image_loader_unittest.cc
@@ -250,7 +250,7 @@ TEST_F(ImageLoaderTest, IsComponentExtensionResource) {
       extension_misc::EXTENSION_ICON_BITTY,
       ExtensionIconSet::MATCH_EXACTLY);
 
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
   int resource_id;
   ASSERT_EQ(true,
             ImageLoader::IsComponentExtensionResource(extension->path(),
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 157cae0..8dbcae9 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -142,10 +142,8 @@
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/screenlock_private_api.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
-#if defined(FILE_MANAGER_EXTENSION)
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
 #endif
-#endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
@@ -308,7 +306,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   ExtensionToolbarModelFactory::GetInstance();
 #endif  // defined(ENABLE_EXTENSIONS)
   FaviconServiceFactory::GetInstance();
-#if defined(OS_CHROMEOS) && defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
   file_manager::FileBrowserPrivateAPIFactory::GetInstance();
 #endif
   FindBarStateFactory::GetInstance();
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index aa52ce2..c86f939 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -82,7 +82,7 @@
       <include name="IDR_FEEDBACK_FEEDBACK_CSS" file="feedback/css/feedback.css" type="BINDATA" />
       <include name="IDR_FEEDBACK_ICON_32" file="feedback/images/icon32.png" type="BINDATA" />
       <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" type="BINDATA" />
-      <if expr="pp_ifdef('file_manager_extension')">
+      <if expr="pp_ifdef('chromeos')">
         <!-- App pages and scripts. -->
         <include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
         <include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/foreground/js/main_scripts.js" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index 154cefe..c464f19 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -54,7 +54,7 @@
 #include "net/base/url_util.h"
 #include "net/http/http_status_code.h"
 
-#ifdef FILE_MANAGER_EXTENSION
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "extensions/common/constants.h"
 #endif
@@ -104,7 +104,7 @@ bool TranslateManager::IsTranslatableURL(const GURL& url) {
   return !url.is_empty() &&
          !url.SchemeIs(chrome::kChromeUIScheme) &&
          !url.SchemeIs(chrome::kChromeDevToolsScheme) &&
-#ifdef FILE_MANAGER_EXTENSION
+#if defined(OS_CHROMEOS)
          !(url.SchemeIs(extensions::kExtensionScheme) &&
            url.DomainIs(file_manager::kFileManagerAppId)) &&
 #endif
diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc
index 88d773c..0dbb9af 100644
--- a/chrome/browser/translate/translate_manager_unittest.cc
+++ b/chrome/browser/translate/translate_manager_unittest.cc
@@ -8,7 +8,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-#ifdef FILE_MANAGER_EXTENSION
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "extensions/common/constants.h"
 #endif
@@ -27,7 +27,7 @@ TEST_F(TranslateManagerTest, CheckTranslatableURL) {
   GURL devtools_url = GURL(devtools);
   EXPECT_FALSE(TranslateManager::IsTranslatableURL(devtools_url));
 
-#ifdef FILE_MANAGER_EXTENSION
+#if defined(OS_CHROMEOS)
   std::string filemanager =
       std::string(extensions::kExtensionScheme) +
       std::string("://") +
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
index 339bc04..d6b1094 100644
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc
@@ -21,7 +21,7 @@
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"
 #endif
@@ -83,7 +83,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
     keyboard::InitializeKeyboard();
 #endif
 
-#if defined(FILE_MANAGER_EXTENSION)
+#if defined(OS_CHROMEOS)
   ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
 #endif
 }
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 429e7db..dd33c4d 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -3298,8 +3298,8 @@
             }],
           ],
         }],
-        # File manager extension replaces the native OS file open/save dialog.
-        ['file_manager_extension==1', {
+        # On chromeos, file manager extension handles the file open/save dialog.
+        ['chromeos==1', {
           'sources/': [
             ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
             ['include', '^browser/ui/views/select_file_dialog_extension.h'],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5e5556c..b5437d2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1768,6 +1768,7 @@
             'browser/net/nss_context_chromeos_browsertest.cc',
             'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
             'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
+            'browser/ui/views/select_file_dialog_extension_browsertest.cc',
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],
@@ -1791,11 +1792,6 @@
             '../build/linux/system.gyp:dbus',
           ],
         }],
-        ['file_manager_extension==0', {
-          'sources!': [
-            'browser/ui/views/select_file_dialog_extension_browsertest.cc',
-          ],
-        }],
         ['configuration_policy==0', {
           'sources/': [
             ['exclude', '^browser/policy/'],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 28ec9c4..13b92a3 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2184,7 +2184,7 @@
             ['exclude', '^browser/task_manager/'],
           ],
         }],
-        ['file_manager_extension==0', {
+        ['chromeos==0', {
           'sources!': [
             'browser/ui/views/select_file_dialog_extension_unittest.cc',
           ],