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

chrome/browser/policy/url_blacklist_manager_unittest.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 "components/policy/core/browser/url_blacklist_manager.h"
 
 #include <ostream>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/policy/policy_helpers.h"
 #include "components/policy/core/common/policy_pref_names.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 // TODO(joaodasilva): this file should be moved next to
 // components/policy/core/browser/url_blacklist_manager.(cc|h).
 // However, url_fixer_upper.h can't be included from the component. Rather
-// than having it mocked out, the actual url_fixer::SegmentURL call is used
+// than having it mocked out, the actual url_formatter::SegmentURL call is used
 // to make sure that the parsing of URL filters is correct.
 
 namespace policy {
 
 namespace {
 
 // Helper to get the disambiguated SegmentURL() function.
 URLBlacklist::SegmentURLCallback GetSegmentURLCallback() {
-  return url_fixer::SegmentURL;
+  return url_formatter::SegmentURL;
 }
 
 class TestingURLBlacklistManager : public URLBlacklistManager {
  public:
   explicit TestingURLBlacklistManager(PrefService* pref_service)
       : URLBlacklistManager(pref_service,
                             base::ThreadTaskRunnerHandle::Get(),
                             base::ThreadTaskRunnerHandle::Get(),
                             GetSegmentURLCallback(),
                             base::Bind(OverrideBlacklistForURL)),
@@ skipping 619 matching lines @@
   blacklist.Allow(allowed.get());
 
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://www.google.com")));
   EXPECT_TRUE((blacklist.IsURLBlocked(GURL("chrome-extension://xyz"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-extension://abc"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-search://local-ntp"))));
   EXPECT_FALSE((blacklist.IsURLBlocked(GURL("chrome-native://ntp"))));
 }
 
 }  // namespace policy