[Chromeshine] Forward declare more.

Remove some unnecessary compilation dependencies.

Bug: 918983
Change-Id: I8521a212443c35a541c7eedb9b5adc0327c4b5f7
Reviewed-on: https://chromium-review.googlesource.com/c/1478176Reviewed-by: Patrick Noland <pnoland@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#633765}

chrome/browser/android/usage_stats/usage_stats_bridge.cc

@@ -10,6 +10,7 @@
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/usage_stats/usage_stats_database.h"
+#include "chrome/browser/android/usage_stats/website_event.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/common/pref_names.h"

chrome/browser/android/usage_stats/usage_stats_database.cc

@@ -7,9 +7,12 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/callback.h"
 #include "base/strings/safe_sprintf.h"
 #include "base/strings/strcat.h"
 #include "base/task/post_task.h"
+#include "chrome/browser/android/usage_stats/website_event.pb.h"
+#include "chrome/browser/profiles/profile.h"
 #include "components/leveldb_proto/content/proto_database_provider_factory.h"
 #include "components/leveldb_proto/public/proto_database_provider.h"
 

chrome/browser/android/usage_stats/usage_stats_database.h

@@ -10,18 +10,22 @@
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/callback_forward.h"
 #include "base/containers/flat_set.h"
 #include "base/containers/queue.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/android/usage_stats/website_event.pb.h"
-#include "chrome/browser/profiles/profile.h"
 #include "components/leveldb_proto/public/proto_database.h"
 
+class Profile;
+
 namespace usage_stats {
 
+class WebsiteEvent;
+class Suspension;
+class TokenMapping;
+
 using leveldb_proto::ProtoDatabase;
 
 // Stores website events, suspensions and token to fully-qualified domain name

chrome/browser/android/usage_stats/usage_stats_database_unittest.cc

@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "chrome/browser/android/usage_stats/website_event.pb.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"