From 3f383853bdea91d3cf86d4214e4dfdee6a585805 Mon Sep 17 00:00:00 2001
From: "thestig@chromium.org"
<thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 3 Apr 2009 18:18:55 +0000
Subject: Remove unneeded uses of base/pickle.h. Add some explicit #includes.
Review URL: http://codereview.chromium.org/60095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13093 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/browser/bookmarks/bookmark_model.h | 12 ++++++++----
chrome/browser/extensions/user_script_master.h | 7 +++++--
chrome/browser/google_url_tracker.h | 3 +++
chrome/browser/sessions/session_backend.cc | 1 -
4 files changed, 16 insertions(+), 7 deletions(-)
(limited to 'chrome/browser')
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index f3b05a5..5f63b73 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -2,11 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
-#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
#include "build/build_config.h"
+#include <set>
+#include <vector>
+
#include "base/lock.h"
#include "base/observer_list.h"
#include "base/waitable_event.h"
@@ -19,6 +22,7 @@
#include "chrome/views/controls/tree/tree_node_model.h"
#include "googleurl/src/gurl.h"
#include "skia/include/SkBitmap.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
class BookmarkEditorView;
class BookmarkModel;
@@ -413,7 +417,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
// urls.
// WARNING: nodes_ordered_by_url_set_ is accessed on multiple threads. As
// such, be sure and wrap all usage of it around url_lock_.
- typedef std::multiset<BookmarkNode*,NodeURLComparator> NodesOrderedByURLSet;
+ typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet;
NodesOrderedByURLSet nodes_ordered_by_url_set_;
Lock url_lock_;
@@ -433,4 +437,4 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
};
-#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
+#endif // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index d546b62..b4932f2 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_MASTER_H_
#define CHROME_BROWSER_EXTENSIONS_USER_SCRIPT_MASTER_H_
+#include <vector>
+
#include "base/directory_watcher.h"
#include "base/file_path.h"
#include "base/message_loop.h"
@@ -14,6 +16,7 @@
#include "base/string_piece.h"
#include "chrome/common/extensions/user_script.h"
#include "googleurl/src/gurl.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
// Manages a segment of shared memory that contains the user scripts the user
// has installed. Lives on the UI thread.
@@ -77,8 +80,8 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
static void LoadScriptsFromDirectory(const FilePath script_dir,
UserScriptList* result);
- ScriptReloader(UserScriptMaster* master)
- : master_(master), master_message_loop_(MessageLoop::current()) {}
+ explicit ScriptReloader(UserScriptMaster* master)
+ : master_(master), master_message_loop_(MessageLoop::current()) {}
// Start a scan for scripts.
// Will always send a message to the master upon completion.
diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google_url_tracker.h
index f447c96..bdc7290 100644
--- a/chrome/browser/google_url_tracker.h
+++ b/chrome/browser/google_url_tracker.h
@@ -5,9 +5,12 @@
#ifndef CHROME_BROWSER_GOOGLE_URL_TRACKER_H_
#define CHROME_BROWSER_GOOGLE_URL_TRACKER_H_
+#include <string>
+
#include "chrome/browser/net/url_fetcher.h"
#include "chrome/common/notification_observer.h"
#include "googleurl/src/gurl.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
class PrefService;
diff --git a/chrome/browser/sessions/session_backend.cc b/chrome/browser/sessions/session_backend.cc
index 240d151..ea14c17 100644
--- a/chrome/browser/sessions/session_backend.cc
+++ b/chrome/browser/sessions/session_backend.cc
@@ -8,7 +8,6 @@
#include "base/file_util.h"
#include "base/histogram.h"
-#include "base/pickle.h"
#include "chrome/common/scoped_vector.h"
using base::TimeTicks;
--
cgit v1.1