Cleanup usage of history namespace in components/history

components/history/core/browser/top_sites_database.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/history/core/browser/top_sites_database.h"
 
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "sql/connection.h"
 #include "sql/recovery.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 #include "third_party/sqlite/sqlite3.h"
 
+namespace history {
+
 // Description of database table:
 //
 // thumbnails
 //   url              URL of the sites for which we have a thumbnail.
 //   url_rank         Index of the URL in that thumbnail, 0-based. The thumbnail
 //                    with the highest rank will be the next one evicted. Forced
 //                    thumbnails have a rank of -1.
 //   title            The title to display under that thumbnail.
 //   redirects        A space separated list of URLs that are known to redirect
 //                    to this url.
@@ skipping 41 matching lines @@
       "boring_score DOUBLE DEFAULT 1.0,"
       "good_clipping INTEGER DEFAULT 0,"
       "at_top INTEGER DEFAULT 0,"
       "last_updated INTEGER DEFAULT 0,"
       "load_completed INTEGER DEFAULT 0,"
       "last_forced INTEGER DEFAULT 0)";
   return db->Execute(kThumbnailsSql);
 }
 
 // Encodes redirects into a string.
-std::string GetRedirects(const history::MostVisitedURL& url) {
+std::string GetRedirects(const MostVisitedURL& url) {
   std::vector<std::string> redirects;
   for (size_t i = 0; i < url.redirects.size(); i++)
     redirects.push_back(url.redirects[i].spec());
   return JoinString(redirects, ' ');
 }
 
 // Decodes redirects from a string and sets them for the url.
-void SetRedirects(const std::string& redirects, history::MostVisitedURL* url) {
+void SetRedirects(const std::string& redirects, MostVisitedURL* url) {
   std::vector<std::string> redirects_vector;
   base::SplitStringAlongWhitespace(redirects, &redirects_vector);
   for (size_t i = 0; i < redirects_vector.size(); ++i) {
     GURL redirects_url(redirects_vector[i]);
     if (redirects_url.is_valid())
       url->redirects.push_back(redirects_url);
   }
 }
 
 // Track various failure (and success) cases in recovery code.
@@ skipping 238 matching lines @@
   // possible that running recovery would be a reasonable default when errors
   // are seen.
 
   // The default handling is to assert on debug and to ignore on release.
   if (!sql::Connection::ShouldIgnoreSqliteError(extended_error))
     DLOG(FATAL) << db->GetErrorMessage();
 }
 
 }  // namespace
 
-namespace history {
-
 // static
 const int TopSitesDatabase::kRankOfForcedURL = -1;
 
 // static
 const int TopSitesDatabase::kRankOfNonExistingURL = -2;
 
 TopSitesDatabase::TopSitesDatabase() {
 }
 
 TopSitesDatabase::~TopSitesDatabase() {
@@ skipping 362 matching lines @@
   db->set_error_callback(base::Bind(&DatabaseErrorCallback, db.get(), db_name));
   db->set_page_size(4096);
   db->set_cache_size(32);
 
   if (!db->Open(db_name))
     return NULL;
   return db.release();
 }
 
 }  // namespace history