Converting file_display_name_ type from base::string16 to base::FilePath.

chrome/browser/ui/webui/extensions/install_extension_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/crx_installer.h"
@@ skipping 61 matching lines @@
   if (drop_data->filenames.empty()) {
     DLOG(ERROR) << "Current drop data contains no files.";
     return;
   }
 
   const ui::FileInfo& file_info = drop_data->filenames.front();
 
   file_to_install_ = file_info.path;
   // Use the display name if provided, for checking file names
   // (.path is likely a random hash value in that case).
-  // TODO(dcheng): It would be nice to make this a FilePath too.

[not at google - send to devlin, 2015/05/11 18:06:07]

I don't understand this TODO and disagree with this change. dcheng@ - context?

-  file_display_name_ = file_info.display_name.empty()
-                           ? file_info.path.AsUTF16Unsafe()
-                           : file_info.display_name.AsUTF16Unsafe();
+  file_display_name_ =
+      file_info.display_name.empty() ? file_info.path : file_info.display_name;
 }
 
 void InstallExtensionHandler::HandleStopDragMessage(
     const base::ListValue* args) {
   file_to_install_.clear();
   file_display_name_.clear();
 }
 
 void InstallExtensionHandler::HandleInstallMessage(
     const base::ListValue* args) {
   if (file_to_install_.empty()) {
     LOG(ERROR) << "No file captured to install.";
     return;
   }
 
   Profile* profile = Profile::FromBrowserContext(
       web_ui()->GetWebContents()->GetBrowserContext());
 
   const bool kCaseSensitive = false;
 
-  if (EndsWith(
-          file_display_name_, base::ASCIIToUTF16(".zip"), kCaseSensitive)) {
+  if (EndsWith(file_display_name_.AsUTF16Unsafe(), base::ASCIIToUTF16(".zip"),

[dcheng, 2015/05/11 18:16:15]

Why not FilePath::MatchesExtension()?

That being said, I'm not sure why this is case sensitive.

[not at google - send to devlin, 2015/05/11 18:28:32]

Using MatchesExtension would make this change much nicer. I presume that the
file extensions of the non-display-name isn't preserved when it's some hash.
That would be pretty weird if it were.

[Deepak, 2015/05/12 05:41:58]

I agree with you, Anyways kCaseSensitive value is always flase in our case and
FilePath::MatchesExtension() ignore case.
So we can directly use FilePath::MatchesExtension().

+               kCaseSensitive)) {
     ZipFileInstaller::Create(ExtensionSystem::Get(profile)->extension_service())
         ->LoadFromZipFile(file_to_install_);
   } else {
     scoped_ptr<ExtensionInstallPrompt> prompt(
         new ExtensionInstallPrompt(web_ui()->GetWebContents()));
     scoped_refptr<CrxInstaller> crx_installer(CrxInstaller::Create(
         ExtensionSystem::Get(profile)->extension_service(), prompt.Pass()));
     crx_installer->set_error_on_unsupported_requirements(true);
     crx_installer->set_off_store_install_allow_reason(
         CrxInstaller::OffStoreInstallAllowedFromSettingsPage);
     crx_installer->set_install_immediately(true);
 
-    if (EndsWith(file_display_name_,
-                 base::ASCIIToUTF16(".user.js"),
-                 kCaseSensitive)) {
+    if (EndsWith(file_display_name_.AsUTF16Unsafe(),
+                 base::ASCIIToUTF16(".user.js"), kCaseSensitive)) {
       crx_installer->InstallUserScript(
           file_to_install_, net::FilePathToFileURL(file_to_install_));
-    } else if (EndsWith(file_display_name_,
-                        base::ASCIIToUTF16(".crx"),
-                        kCaseSensitive)) {
+    } else if (EndsWith(file_display_name_.AsUTF16Unsafe(),
+                        base::ASCIIToUTF16(".crx"), kCaseSensitive)) {
       crx_installer->InstallCrx(file_to_install_);
     } else {
       CHECK(false);
     }
   }
 
   file_to_install_.clear();
   file_display_name_.clear();
 }
 
 void InstallExtensionHandler::HandleInstallDirectoryMessage(
     const base::ListValue* args) {
   Profile* profile = Profile::FromBrowserContext(
       web_ui()->GetWebContents()->GetBrowserContext());
   UnpackedInstaller::Create(
       ExtensionSystem::Get(profile)->
           extension_service())->Load(file_to_install_);
 }
 
 }  // namespace extensions