Revert 222242 "[Activity Log] when extension is uninstalled, del..."

trunk/src/chrome/browser/extensions/activity_log/activity_log.cc

Index: trunk/src/chrome/browser/extensions/activity_log/activity_log.cc
===================================================================
--- trunk/src/chrome/browser/extensions/activity_log/activity_log.cc	(revision 222255)
+++ trunk/src/chrome/browser/extensions/activity_log/activity_log.cc	(working copy)
@@ -302,11 +302,6 @@
   DependsOn(InstallTrackerFactory::GetInstance());
 }
 
-// static
-ActivityLog* ActivityLog::GetInstance(Profile* profile) {
-  return ActivityLogFactory::GetForProfile(profile);
-}
-
 ActivityLogFactory::~ActivityLogFactory() {
 }
 
@@ -451,17 +446,18 @@
 void ActivityLog::OnExtensionUninstalled(const Extension* extension) {
   // If the extension has been uninstalled but not disabled, we delete the
   // database.
-  if (extension->id() == kActivityLogExtensionId) {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableExtensionActivityLogging)) {
-      DeleteDatabase();
-    }
-  } else {
-    if (policy_)
-      policy_->RemoveExtensionData(extension->id());
+  if (extension->id() != kActivityLogExtensionId) return;
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableExtensionActivityLogging)) {
+    DeleteDatabase();
   }
 }
 
+// static
+ActivityLog* ActivityLog::GetInstance(Profile* profile) {
+  return ActivityLogFactory::GetForProfile(profile);
+}
+
 void ActivityLog::AddObserver(ActivityLog::Observer* observer) {
   observers_->AddObserver(observer);
 }