Cleanup: Remove some crust from the extensions code.
Review URL: https://chromiumcodereview.appspot.com/11198010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163187 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc
index 2cdc05f..3ae3897 100644
--- a/chrome/browser/chromeos/login/help_app_launcher.cc
+++ b/chrome/browser/chromeos/login/help_app_launcher.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "content/public/browser/browser_thread.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -21,7 +22,7 @@
const char kHelpAppFormat[] =
"chrome-extension://honijodknafkokifofgiaalefdiedpko/oobe.html?id=%d";
-}
+} // namespace
namespace chromeos {
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc
index 563ad0f..df891d7 100644
--- a/chrome/browser/extensions/api/processes/processes_api.cc
+++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -210,7 +210,7 @@
#endif // defined(ENABLE_TASK_MANAGER)
-} // local namespace
+} // namespace
ProcessesEventRouter* ProcessesEventRouter::GetInstance() {
return Singleton<ProcessesEventRouter>::get();
@@ -258,7 +258,7 @@
}
void ProcessesEventRouter::ListenerRemoved() {
- DCHECK(listeners_ > 0);
+ DCHECK_GT(listeners_, 0);
--listeners_;
#if defined(ENABLE_TASK_MANAGER)
// The task manager has its own ref count to balance other callers of
@@ -396,7 +396,7 @@
void ProcessesEventRouter::OnItemsToBeRemoved(int start, int length) {
#if defined(ENABLE_TASK_MANAGER)
- DCHECK(length == 1);
+ DCHECK_EQ(length, 1);
// Process exit for renderer processes has the data about exit code and
// termination status, therefore we will rely on notifications and not on
@@ -485,7 +485,7 @@
void ProcessesEventRouter::NotifyProfiles(const char* event_name,
scoped_ptr<ListValue> event_args) {
for (ProfileSet::iterator it = profiles_.begin();
- it != profiles_.end(); it++) {
+ it != profiles_.end(); ++it) {
Profile* profile = *it;
scoped_ptr<ListValue> event_args_copy(event_args->DeepCopy());
DispatchEvent(profile, event_name, event_args_copy.Pass());
@@ -496,9 +496,9 @@
// interest, we need to ask each profile whether it has one registered.
// We only need to look for the profiles that have registered with the
// this extension API.
-bool ProcessesEventRouter::HasEventListeners(std::string& event_name) {
+bool ProcessesEventRouter::HasEventListeners(const std::string& event_name) {
for (ProfileSet::iterator it = profiles_.begin();
- it != profiles_.end(); it++) {
+ it != profiles_.end(); ++it) {
Profile* profile = *it;
extensions::EventRouter* router = profile->GetExtensionEventRouter();
if (!router)
@@ -735,7 +735,7 @@
}
}
}
- DCHECK(process_ids_.size() == 0);
+ DCHECK_EQ(process_ids_.size(), 0U);
}
SetResult(processes);
diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h
index 9f94628..c30169a 100644
--- a/chrome/browser/extensions/api/processes/processes_api.h
+++ b/chrome/browser/extensions/api/processes/processes_api.h
@@ -78,7 +78,7 @@
// Determines whether there is a registered listener for the specified event.
// It helps to avoid collecing data if no one is interested in it.
- bool HasEventListeners(std::string& event_name);
+ bool HasEventListeners(const std::string& event_name);
// Used for tracking registrations to process related notifications.
content::NotificationRegistrar registrar_;
diff --git a/chrome/browser/extensions/api/web_request/web_request_time_tracker.cc b/chrome/browser/extensions/api/web_request/web_request_time_tracker.cc
index 68f6d27..d95e2b8 100644
--- a/chrome/browser/extensions/api/web_request/web_request_time_tracker.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_time_tracker.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_warning_set.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index d5bb818..d07ef90b 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -117,6 +117,7 @@
#include "sync/api/sync_error_factory.h"
#include "webkit/database/database_tracker.h"
#include "webkit/database/database_util.h"
+
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
@@ -486,8 +487,7 @@
return;
#if defined(ENABLE_EXTENSIONS)
- history_event_router_.reset(new HistoryExtensionEventRouter());
- history_event_router_->ObserveProfile(profile_);
+ history_event_router_.reset(new HistoryExtensionEventRouter(profile_));
browser_event_router_.reset(new extensions::BrowserEventRouter(profile_));
browser_event_router_->Init();
window_event_router_.reset(new extensions::WindowEventRouter(profile_));
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 9bc1664..2c25de5 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -14,11 +14,9 @@
#include "base/compiler_specific.h"
#include "base/file_path.h"
#include "base/gtest_prod_util.h"
-#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/string16.h"
-#include "base/tuple.h"
#include "chrome/browser/api/prefs/pref_change_registrar.h"
#include "chrome/browser/extensions/app_shortcut_manager.h"
#include "chrome/browser/extensions/app_sync_bundle.h"
@@ -36,7 +34,6 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_set.h"
-#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
#include "sync/api/string_ordinal.h"
@@ -46,7 +43,6 @@
class BookmarkExtensionEventRouter;
class CommandLine;
class ExtensionErrorUI;
-class ExtensionFontSettingsEventRouter;
class ExtensionManagementEventRouter;
class ExtensionSyncData;
class ExtensionToolbarModel;
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index 67b4328e..78432e41 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/extensions/requirements_checker.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_file_util.h"
+#include "content/public/browser/browser_thread.h"
#include "sync/api/string_ordinal.h"
using content::BrowserThread;
diff --git a/chrome/browser/history/history_extension_api.cc b/chrome/browser/history/history_extension_api.cc
index bb6dfbc..4e7936f 100644
--- a/chrome/browser/history/history_extension_api.cc
+++ b/chrome/browser/history/history_extension_api.cc
@@ -29,6 +29,11 @@
using extensions::api::history::HistoryItem;
using extensions::api::history::VisitItem;
+typedef std::vector<linked_ptr<extensions::api::history::HistoryItem> >
+ HistoryItemList;
+typedef std::vector<linked_ptr<extensions::api::history::VisitItem> >
+ VisitItemList;
+
namespace AddUrl = extensions::api::history::AddUrl;
namespace DeleteUrl = extensions::api::history::DeleteUrl;
namespace DeleteRange = extensions::api::history::DeleteRange;
@@ -120,12 +125,7 @@
} // namespace
-HistoryExtensionEventRouter::HistoryExtensionEventRouter() {}
-
-HistoryExtensionEventRouter::~HistoryExtensionEventRouter() {}
-
-void HistoryExtensionEventRouter::ObserveProfile(Profile* profile) {
- CHECK(registrar_.IsEmpty());
+HistoryExtensionEventRouter::HistoryExtensionEventRouter(Profile* profile) {
const content::Source<Profile> source = content::Source<Profile>(profile);
registrar_.Add(this,
chrome::NOTIFICATION_HISTORY_URL_VISITED,
@@ -135,6 +135,8 @@
source);
}
+HistoryExtensionEventRouter::~HistoryExtensionEventRouter() {}
+
void HistoryExtensionEventRouter::Observe(
int type,
const content::NotificationSource& source,
diff --git a/chrome/browser/history/history_extension_api.h b/chrome/browser/history/history_extension_api.h
index 4e0dec2d..0e55192 100644
--- a/chrome/browser/history/history_extension_api.h
+++ b/chrome/browser/history/history_extension_api.h
@@ -20,20 +20,13 @@
class ListValue;
}
-typedef std::vector<linked_ptr<
- extensions::api::history::HistoryItem> > HistoryItemList;
-typedef std::vector<linked_ptr<
- extensions::api::history::VisitItem> > VisitItemList;
-
// Observes History service and routes the notifications as events to the
// extension system.
class HistoryExtensionEventRouter : public content::NotificationObserver {
public:
- explicit HistoryExtensionEventRouter();
+ explicit HistoryExtensionEventRouter(Profile* profile);
virtual ~HistoryExtensionEventRouter();
- void ObserveProfile(Profile* profile);
-
private:
// content::NotificationObserver::Observe.
virtual void Observe(int type,
diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc
index d5f765f..5c42b950 100644
--- a/chrome/browser/sync/test/integration/extension_settings_helper.cc
+++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/value_store/value_store.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_set.h"
+#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
using sync_datatype_helper::test;
