Port some strings in download/save_package.cc

chrome/browser/download/save_package_unittest.cc

 // Copyright (c) 2006-2008 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 "base/logging.h"
 #include "chrome/browser/download/save_package.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //    0         1         2         3         4         5         6
 //    0123456789012345678901234567890123456789012345678901234567890123456789
@@ skipping 20 matching lines @@
   bool GetGeneratedFilename(bool need_success_generate_filename,
                             const std::string& disposition,
                             const std::wstring& url,
                             bool need_htm_ext,
                             std::wstring* generated_name) {
     SavePackage* save_package;
     if (need_success_generate_filename)
       save_package = save_package_success_.get();
     else
       save_package = save_package_fail_.get();
-    return save_package->GenerateFilename(disposition, url, need_htm_ext,
+    return save_package->GenerateFilename(disposition, GURL(url), need_htm_ext,
                                           generated_name);
   }
 
  protected:
   DISALLOW_EVIL_CONSTRUCTORS(SavePackageTest);
 
  private:
   // SavePackage for successfully generating file name.
   scoped_refptr<SavePackage> save_package_success_;
   // SavePackage for failed generating file name.
@@ skipping 93 matching lines @@
 
 TEST_F(SavePackageTest, TestSuccessfullyGenerateSavePackageFilename) {
   for (int i = 0; i < arraysize(kGeneratedFiles); ++i) {
     std::wstring file_name;
     bool ok = GetGeneratedFilename(true,
                                    kGeneratedFiles[i].disposition,
                                    kGeneratedFiles[i].url,
                                    kGeneratedFiles[i].need_htm_ext,
                                    &file_name);
     ASSERT_TRUE(ok);
-    EXPECT_EQ(file_name, kGeneratedFiles[i].expected_name);
+    EXPECT_EQ(kGeneratedFiles[i].expected_name, file_name);
   }
 }
 
 TEST_F(SavePackageTest, TestUnSuccessfullyGenerateSavePackageFilename) {
   for (int i = 0; i < arraysize(kGeneratedFiles); ++i) {
     std::wstring file_name;
     bool ok = GetGeneratedFilename(false,
                                    kGeneratedFiles[i].disposition,
                                    kGeneratedFiles[i].url,
                                    kGeneratedFiles[i].need_htm_ext,
                                    &file_name);
     ASSERT_FALSE(ok);
   }
 }