Cleaned up includes and unused declarations in the bookmarks component.

BUG=None

Review URL: https://codereview.chromium.org/277893002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269562 0039d316-1c4b-4281-b951-d872f2087c98

components/bookmarks/core/browser/bookmark_client.h

@@ -6,13 +6,14 @@
 #define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CLIENT_H_
 
 #include <set>
+#include <utility>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/task/cancelable_task_tracker.h"
 
-class GURL;
 class BookmarkNode;
+class GURL;
 
 namespace base {
 struct UserMetricsAction;

components/bookmarks/core/browser/bookmark_codec.cc

@@ -351,7 +351,7 @@ bool BookmarkCodec::DecodeNode(const base::DictionaryValue& value,
   }
 
   node->SetTitle(title);
-  node->set_date_added(base::Time::FromInternalValue(internal_time));
+  node->set_date_added(Time::FromInternalValue(internal_time));
 
   int64 sync_transaction_version = node->sync_transaction_version();
   BookmarkNode::MetaInfoMap meta_info_map;

components/bookmarks/core/browser/bookmark_index.cc

@@ -11,13 +11,11 @@
 
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
-#include "base/strings/string16.h"
 #include "base/strings/utf_offset_string_conversions.h"
 #include "components/bookmarks/core/browser/bookmark_client.h"
 #include "components/bookmarks/core/browser/bookmark_match.h"
 #include "components/bookmarks/core/browser/bookmark_node.h"
 #include "components/bookmarks/core/browser/bookmark_utils.h"
-#include "components/query_parser/query_parser.h"
 #include "components/query_parser/snippet.h"
 #include "third_party/icu/source/common/unicode/normalizer2.h"
 

components/bookmarks/core/browser/bookmark_index.h

@@ -7,6 +7,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"

components/bookmarks/core/browser/bookmark_model.cc

@@ -431,7 +431,7 @@ void BookmarkModel::OnFaviconChanged(const std::set<GURL>& urls) {
 }
 
 void BookmarkModel::SetDateAdded(const BookmarkNode* node,
-                                 base::Time date_added) {
+                                 Time date_added) {
   if (!node) {
     NOTREACHED();
     return;

components/bookmarks/core/browser/bookmark_node.cc

@@ -4,6 +4,9 @@
 
 #include "components/bookmarks/core/browser/bookmark_node.h"
 
+#include <map>
+#include <string>
+
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 

components/bookmarks/core/browser/bookmark_storage.cc

@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
-#include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/metrics/histogram.h"

components/bookmarks/core/browser/bookmark_storage.h

@@ -18,10 +18,6 @@ namespace base {
 class SequencedTaskRunner;
 }
 
-namespace content {
-class BrowserContext;
-}
-
 // BookmarkLoadDetails is used by BookmarkStorage when loading bookmarks.
 // BookmarkModel creates a BookmarkLoadDetails and passes it (including
 // ownership) to BookmarkStorage. BookmarkStorage loads the bookmarks (and

components/bookmarks/core/browser/bookmark_utils.cc

@@ -12,7 +12,6 @@
 #include "base/i18n/string_search.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
-#include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/bookmarks/core/browser/bookmark_model.h"
@@ -38,7 +37,7 @@ void CloneBookmarkNodeImpl(BookmarkModel* model,
                            int index_to_add_at,
                            bool reset_node_times) {
   if (element.is_url) {
-    base::Time date_added = reset_node_times ? Time::Now() : element.date_added;
+    Time date_added = reset_node_times ? Time::Now() : element.date_added;
     DCHECK(!date_added.is_null());
 
     model->AddURLWithCreationTimeAndMetaInfo(parent,
@@ -219,7 +218,7 @@ std::vector<const BookmarkNode*> GetMostRecentlyModifiedFolders(
 
   while (iterator.has_next()) {
     const BookmarkNode* parent = iterator.Next();
-    if (parent->is_folder() && parent->date_folder_modified() > base::Time()) {
+    if (parent->is_folder() && parent->date_folder_modified() > Time()) {
       if (max_count == 0) {
         nodes.push_back(parent);
       } else {

components/bookmarks/core/browser/bookmark_utils.h

@@ -14,7 +14,6 @@
 
 class BookmarkModel;
 class BookmarkNode;
-class Profile;
 class GURL;
 
 namespace user_prefs {

components/bookmarks/core/common/bookmark_pref_names.h

@@ -10,8 +10,6 @@
 namespace prefs {
 
 extern const char kBookmarkEditorExpandedNodes[];
-extern const char kBookmarkPromptEnabled[];
-extern const char kBookmarkPromptImpressionCount[];
 extern const char kShowBookmarkBar[];
 extern const char kEditBookmarksEnabled[];
 extern const char kShowAppsShortcutInBookmarkBar[];