Move net::FormatUrl and friends outside of //net and into //components

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 #include "components/user_prefs/user_prefs.h"
 
 using bookmarks::BookmarkExpandedStateTracker;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 @interface BookmarkEditorController (Private)
 
 // Grab the url from the text field and convert.
 - (GURL)GURLFromUrlField;
@@ skipping 72 matching lines @@
   // Be conservative; it is needed (e.g. "Add Page...")
   node_ = NULL;
   [self cancel:self];
 }
 
 #pragma mark Bookmark Editing
 
 // If possible, return a valid GURL from the URL text field.
 - (GURL)GURLFromUrlField {
   NSString* url = [self displayURL];
-  return url_fixer::FixupURL([url UTF8String], std::string());
+  return url_formatter::FixupURL([url UTF8String], std::string());
 }
 
 // Enable the OK button if there is a valid URL.
 - (BOOL)okEnabled {
   BOOL okEnabled = NO;
   if ([[self displayURL] length]) {
     GURL newURL = [self GURLFromUrlField];
     okEnabled = (newURL.is_valid()) ? YES : NO;
   }
   if (okEnabled)
@@ skipping 47 matching lines @@
       SetExpandedNodes(expanded_nodes);
   return [NSNumber numberWithBool:YES];
 }
 
 - (NSColor *)urlFieldColor {
   return [urlField_ backgroundColor];
 }
 
 @end  // BookmarkEditorController