Move the clipboard stuff out of base and into app/clipboard. I renamed...

net/base/net_util.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 "net/base/net_util.h"
+
 #include <algorithm>
 #include <map>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
 #include <unicode/ulocdata.h>
 #include <unicode/uniset.h>
 #include <unicode/uscript.h>
 #include <unicode/uset.h>
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <wspiapi.h>  // Needed for Win2k compat.
 #elif defined(OS_POSIX)
 #include <netdb.h>
 #include <sys/socket.h>
 #include <fcntl.h>
 #endif
 
-#include "net/base/net_util.h"
-
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/scoped_clipboard_writer.h"
 #include "base/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/string_escape.h"
 #include "base/string_piece.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/time_format.h"
 #include "grit/net_resources.h"
@@ skipping 1277 matching lines @@
     if (parsed.ref.len > 0)
       url_string.append(UTF8ToWide(std::string(&spec[parsed.ref.begin],
                                                parsed.ref.len)));
     new_parsed->ref.begin = begin;
     new_parsed->ref.len = url_string.length() - begin;
   }
 
   return url_string;
 }
 
-void WriteURLToClipboard(const GURL& url,
-                         const std::wstring& languages,
-                         Clipboard *clipboard) {
-  if (url.is_empty() || !url.is_valid() || !clipboard)
-    return;
-
-  string16 text =
-      // Unescaping path and query is not a good idea because other
-      // applications may not encode non-ASCII characters in UTF-8.
-      // See crbug.com/2820.
-      WideToUTF16(FormatUrl(url, languages, false, UnescapeRule::NONE, NULL,
-                            NULL));
-
-  ScopedClipboardWriter scw(clipboard);
-  scw.WriteURL(text);
-}
-
 GURL SimplifyUrlForRequest(const GURL& url) {
   DCHECK(url.is_valid());
   GURL::Replacements replacements;
   replacements.ClearUsername();
   replacements.ClearPassword();
   replacements.ClearRef();
   return url.ReplaceComponents(replacements);
 }
 
 // Specifies a comma separated list of port numbers that should be accepted
@@ skipping 19 matching lines @@
       if (length > 0)
         ports.insert(StringToInt(WideToASCII(
             allowed_ports.substr(last, length))));
       last = i + 1;
     }
   }
   explicitly_allowed_ports = ports;
 }
 
 }  // namespace net