Revert 20968 - "Merge v8utils.* and utils.*"

src/uri.h

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 13 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_URI_H_
 #define V8_URI_H_
 
 #include "v8.h"
 
 #include "string-search.h"
-#include "utils.h"
+#include "v8utils.h"
 #include "v8conversions.h"
 
 namespace v8 {
 namespace internal {
 
 
 template <typename Char>
 static INLINE(Vector<const Char> GetCharVector(Handle<String> string));
 
 
@@ skipping 259 matching lines @@
       }
     }
   }
 
   return dest;
 }
 
 } }  // namespace v8::internal
 
 #endif  // V8_URI_H_