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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 284 matching lines @@
 }
 
 ActivityLogFactory::ActivityLogFactory()
     : BrowserContextKeyedServiceFactory(
         "ActivityLog",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(ExtensionSystemFactory::GetInstance());
   DependsOn(InstallTrackerFactory::GetInstance());
 }
 
-// static
-ActivityLog* ActivityLog::GetInstance(Profile* profile) {
-  return ActivityLogFactory::GetForProfile(profile);
-}
-
 ActivityLogFactory::~ActivityLogFactory() {
 }
 
 // ActivityLog
 
 // SET THINGS UP. --------------------------------------------------------------
 
 // Use GetInstance instead of directly creating an ActivityLog.
 ActivityLog::ActivityLog(Profile* profile)
     : policy_(NULL),
@@ skipping 124 matching lines @@
   if (watchdog_app_active_) {
     watchdog_app_active_ = false;
     profile_->GetPrefs()->SetBoolean(prefs::kWatchdogExtensionActive,
                                      false);
   }
 }
 
 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);
 }
 
 void ActivityLog::RemoveObserver(ActivityLog::Observer* observer) {
   observers_->RemoveObserver(observer);
 }
 
 // static
 void ActivityLog::RegisterProfilePrefs(
@@ skipping 113 matching lines @@
   RemoveURLs(urls);
 }
 
 void ActivityLog::DeleteDatabase() {
   if (!policy_)
     return;
   policy_->DeleteDatabase();
 }
 
 }  // namespace extensions