Call GenerateSafeFilename() from GetSuggestedFilename().

Call GenerateSafeFilename() from GetSuggestedFilename().

GetSuggestedFilename() would then become the only function that needs to be called to generate downloaded filenames.

BUG=78085
TEST=net_unittests --gtest_filter=*Generate*FileName


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=97581

[asanka, 2011-08-15 18:16:34]

Follow up CL to http://codereview.chromium.org/7300005/

This contains the logic changes to net::GetSuggestedFilename() so that it calls
GenerateSafeFileName() directly.  The patch is effectively what was removed from
the previous CL with the following exceptions:

- The filename isn't trimmed of '.'s and spaces after each determination method.
 Instead, trimming is done once just before the final fallback.

- One unit test changed to account for the above behavior.

- Changes to comments.

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc
File net/base/net_util.cc (right):

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc#newcode...
net/base/net_util.cc:1457: TrimGeneratedFileName(filename);
As discussed in the previous CL, we are trimming the filename at the end,
instead of after each method.

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc#newcode...
net/base/net_util.cc:1487: string16 file_name = GetSuggestedFilename(GURL(url),
This function now just calls GetSuggestedFilename() and switches encoding.  We
can remove it entirely in another CL.

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util_unittest.cc
File net/base/net_util_unittest.cc (right):

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util_unittest.c...
net/base/net_util_unittest.cc:1408: { // C-D specified filename disappears. 
Failover to final filename.
This changed as a result of the logic change in GetSuggestedFilename() where we
trim the filename later in the code and do one final failover to the default
name.

[rvargas (doing something else), 2011-08-16 22:19:59]

LGTM

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc
File net/base/net_util.cc (right):

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc#newcode...
net/base/net_util.cc:1463: ReplaceSubstringsAfterOffset(&filename, 0, "/", "_");
nit: Maybe we should move this to TrimGeneratedFileName

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc#newcode...
net/base/net_util.cc:1487: string16 file_name = GetSuggestedFilename(GURL(url),
nit: looks like we don't need GURL() anymore.

[asanka, 2011-08-17 16:22:00]

Thanks!

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc
File net/base/net_util.cc (right):

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc#newcode...
net/base/net_util.cc:1463: ReplaceSubstringsAfterOffset(&filename, 0, "/", "_");
On 2011/08/16 22:20:00, rvargas wrote:
> nit: Maybe we should move this to TrimGeneratedFileName

Done.

http://codereview.chromium.org/7607013/diff/6001/net/base/net_util.cc#newcode...
net/base/net_util.cc:1487: string16 file_name = GetSuggestedFilename(GURL(url),
On 2011/08/16 22:20:00, rvargas wrote:
> nit: looks like we don't need GURL() anymore.

Done.

[commit-bot: I haz the power, 2011-08-19 17:59:48]

Try job failure for 7607013-10001 (retry) on mac for step "compile" (clobber
build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac&number...

[commit-bot: I haz the power, 2011-08-20 15:51:27]

Change committed as 97581