Use FilePath::Extension instead of the deprecated file_util::GetFileExtensionFromPath.

chrome/browser/printing/printing_layout_uitest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/command_line.h"
+#include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/simple_thread.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/test/test_server.h"
 #include "printing/image.h"
 #include "printing/printing_test.h"
 
 namespace {
@@ skipping 119 matching lines @@
     bool found_prn = false;
     for (int i = 0; i < 100; ++i) {
       file_util::FileEnumerator enumerator(emf_path(), false,
           file_util::FileEnumerator::FILES);
       emf_file.clear();
       prn_file.clear();
       found_emf = false;
       found_prn = false;
       std::wstring file;
       while (!(file = enumerator.Next().ToWStringHack()).empty()) {
-        std::wstring ext = file_util::GetFileExtensionFromPath(file);
-        if (!_wcsicmp(ext.c_str(), L"emf")) {
+        std::wstring ext = FilePath(file).Extension();
+        if (!_wcsicmp(ext.c_str(), L".emf")) {

[Evan Martin, 2011/01/26 20:10:21]

I suggesting these to use the pattern found in the other file (converting to
UTF8 and dropping the "L"

[tfarina, 2011/01/26 20:21:26]

Done.

Evan, a question:
The description for wcsicmp says:
"compare two wide-character strings, by converting them into lower-case".

Should I bother with this, and convert ext to lower case too (using
base::StringToLowerASCII)?

           EXPECT_FALSE(found_emf) << "Found a leftover .EMF file: \"" <<
               emf_file << "\" and \"" << file << "\" when looking for \"" <<
               verification_name << "\"";
           found_emf = true;
           emf_file = file;
           continue;
         }
-        if (!_wcsicmp(ext.c_str(), L"prn")) {
+        if (!_wcsicmp(ext.c_str(), L".prn")) {
           EXPECT_FALSE(found_prn) << "Found a leftover .PRN file: \"" <<
               prn_file << "\" and \"" << file << "\" when looking for \"" <<
               verification_name << "\"";
           prn_file = file;
           found_prn = true;
           file_util::Delete(file, false);
           continue;
         }
         EXPECT_TRUE(false);
       }
@@ skipping 249 matching lines @@
 
     // Force a navigation elsewhere to verify that it's fine with it.
     url = test_server.GetURL("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }