Move MatchPattern to its own header and the base namespace.

content/test/image_decoder_test.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 "content/test/image_decoder_test.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
+#include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebImageDecoder.h"
 
 // Uncomment this to recalculate the MD5 sums; see header comments.
 // #define CALCULATE_MD5_SUMS
 
@@ skipping 102 matching lines @@
                                   base::FileEnumerator::FILES);
   std::vector<base::FilePath> image_files;
   for (base::FilePath next_file_name = enumerator.Next();
        !next_file_name.empty(); next_file_name = enumerator.Next()) {
     base::FilePath base_name = next_file_name.BaseName();
 #if defined(OS_WIN)
     std::string base_name_ascii = base::UTF16ToASCII(base_name.value());
 #else
     std::string base_name_ascii = base_name.value();
 #endif
-    if (MatchPattern(base_name_ascii, pattern))
+    if (base::MatchPattern(base_name_ascii, pattern))
       image_files.push_back(next_file_name);
   }
 
   return image_files;
 }
 
 bool ImageDecoderTest::ShouldImageFail(const base::FilePath& path) const {
   const base::FilePath::StringType kBadSuffix(FILE_PATH_LITERAL(".bad."));
   return (path.value().length() > (kBadSuffix.length() + format_.length()) &&
           !path.value().compare(path.value().length() - format_.length() -
@@ skipping 55 matching lines @@
     EXPECT_TRUE(decoder->isFailed());
   } else {
     EXPECT_FALSE(decoder->isFailed()) << image_path.value();
 #if defined(CALCULATE_MD5_SUMS)
     SaveMD5Sum(md5_sum_path, decoder->getFrameAtIndex(desired_frame_index));
 #else
     VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
 #endif
   }
 }