Move some content url constants to /url.

chrome/browser/history/in_memory_url_index.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/history/in_memory_url_index.h"
 
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/browser/history/url_index_private_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "net/base/url_constants.h"
 
 using in_memory_url_index::InMemoryURLIndexCacheItem;
 
 namespace history {
 
 // Called by DoSaveToCacheFile to delete any old cache file at |path| when
 // there is no private data to save. Runs on the FILE thread.
 void DeleteCacheFile(const base::FilePath& path) {
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   base::DeleteFile(path, false);
 }
 
 // Initializes a whitelist of URL schemes.
 void InitializeSchemeWhitelist(std::set<std::string>* whitelist) {
   DCHECK(whitelist);
   if (!whitelist->empty())
     return;  // Nothing to do, already initialized.
   whitelist->insert(std::string(content::kAboutScheme));
   whitelist->insert(std::string(content::kChromeUIScheme));
   whitelist->insert(std::string(content::kFileScheme));
   whitelist->insert(std::string(content::kFtpScheme));
-  whitelist->insert(std::string(content::kHttpScheme));
-  whitelist->insert(std::string(content::kHttpsScheme));
+  whitelist->insert(std::string(net::kHttpScheme));
+  whitelist->insert(std::string(net::kHttpsScheme));
   whitelist->insert(std::string(content::kMailToScheme));
 }
 
 // Restore/SaveCacheObserver ---------------------------------------------------
 
 InMemoryURLIndex::RestoreCacheObserver::~RestoreCacheObserver() {}
 
 InMemoryURLIndex::SaveCacheObserver::~SaveCacheObserver() {}
 
 // RebuildPrivateDataFromHistoryDBTask -----------------------------------------
@@ skipping 281 matching lines @@
         base::Bind(DeleteCacheFile, path));
   }
 }
 
 void InMemoryURLIndex::OnCacheSaveDone(bool succeeded) {
   if (save_cache_observer_)
     save_cache_observer_->OnCacheSaveFinished(succeeded);
 }
 
 }  // namespace history