Move extension_error_utils.* and url_pattern_set.* into

chrome/common/extensions/manifest_tests/extension_manifest_test.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
 #define CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_
 
 #include "base/values.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 86 matching lines @@
                           extensions::Extension::Location location =
                               extensions::Extension::INTERNAL,
                           int flags = extensions::Extension::NO_FLAGS);
 
   void LoadAndExpectError(const Manifest& manifest,
                           const std::string& expected_error,
                           extensions::Extension::Location location =
                               extensions::Extension::INTERNAL,
                           int flags = extensions::Extension::NO_FLAGS);
 
-  void AddPattern(URLPatternSet* extent, const std::string& pattern);
+  void AddPattern(extensions::URLPatternSet* extent,
+                  const std::string& pattern);
 
   // used to differentiate between calls to LoadAndExpectError,
   // LoadAndExpectWarning and LoadAndExpectSuccess via function RunTestcases.
   enum EXPECT_TYPE {
     EXPECT_TYPE_ERROR,
     EXPECT_TYPE_WARNING,
     EXPECT_TYPE_SUCCESS
   };
 
   struct Testcase {
@@ skipping 22 matching lines @@
   // Force the manifest tests to run as though they are on trunk, since several
   // tests rely on manifest features being available that aren't on
   // stable/beta.
   //
   // These objects nest, so if a test wants to explicitly test the behaviour
   // on stable or beta, declare it inside that test.
   extensions::Feature::ScopedCurrentChannel current_channel_;
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_MANIFEST_TESTS_EXTENSION_MANIFEST_TEST_H_