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

chrome/browser/media/media_stream_capture_indicator.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 "chrome/browser/media/media_stream_capture_indicator.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
-#include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "grit/theme_resources.h"
+#include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/common/extensions/extension_constants.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #endif
 
@@ skipping 67 matching lines @@
 
   if (tab_title.empty()) {
     // If the page's title is empty use its security originator.
     tab_title = GetSecurityOrigin(web_contents);
   } else {
     // If the page's title matches its URL, use its security originator.
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     std::string languages =
         profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
-    if (tab_title ==
-        url_formatter::FormatUrl(web_contents->GetURL(), languages))
+    if (tab_title == net::FormatUrl(web_contents->GetURL(), languages))
       tab_title = GetSecurityOrigin(web_contents);
   }
 
   return tab_title;
 }
 
 }  // namespace
 
 // Stores usage counts for all the capture devices associated with a single
 // WebContents instance. Instances of this class are owned by
@@ skipping 340 matching lines @@
   } else if (audio && !video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY;
     *image = *mic_image_;
   } else if (!audio && video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY;
     *image = *camera_image_;
   }
 
   *tool_tip = l10n_util::GetStringUTF16(message_id);
 }