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

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

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
@@ skipping 45 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
 #if defined OS_CHROMEOS
     test_user_manager_.reset();
 #endif
     base::RunLoop().RunUntilIdle();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
-  static void RetrieveActions_LogAndFetchActions0(
-      scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
-    ASSERT_EQ(0, static_cast<int>(i->size()));
-  }
-
-  static void RetrieveActions_LogAndFetchActions2(
+  static void RetrieveActions_LogAndFetchActions(
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     ASSERT_EQ(2, static_cast<int>(i->size()));
   }
 
   void SetPolicy(bool log_arguments) {
     ActivityLog* activity_log = ActivityLog::GetInstance(profile());
     if (log_arguments)
       activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_FULLSTREAM);
     else
       activity_log->SetDefaultPolicy(ActivityLogPolicy::POLICY_COUNTS);
@@ skipping 72 matching lines @@
   action->set_page_url(GURL("http://www.google.com"));
   activity_log->LogAction(action);
 
   activity_log->GetFilteredActions(
       kExtensionId,
       Action::ACTION_ANY,
       "",
       "",
       "",
       0,
-      base::Bind(ActivityLogTest::RetrieveActions_LogAndFetchActions2));
+      base::Bind(ActivityLogTest::RetrieveActions_LogAndFetchActions));
 }
 
 TEST_F(ActivityLogTest, LogPrerender) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                        .Set("name", "Test extension")
                        .Set("version", "1.0.0")
                        .Set("manifest_version", 2))
           .Build();
@@ skipping 67 matching lines @@
   activity_log->GetFilteredActions(
       kExtensionId,
       Action::ACTION_ANY,
       "",
       "",
       "",
       0,
       base::Bind(ActivityLogTest::RetrieveActions_ArgUrlExtraction));
 }
 
-TEST_F(ActivityLogTest, UninstalledExtension) {
-  scoped_refptr<const Extension> extension =
-      ExtensionBuilder()
-          .SetManifest(DictionaryBuilder()
-                       .Set("name", "Test extension")
-                       .Set("version", "1.0.0")
-                       .Set("manifest_version", 2))
-          .Build();
-
-  ActivityLog* activity_log = ActivityLog::GetInstance(profile());
-  scoped_ptr<base::ListValue> args(new base::ListValue());
-  ASSERT_TRUE(GetDatabaseEnabled());
-
-  // Write some API calls
-  scoped_refptr<Action> action = new Action(extension->id(),
-                                            base::Time::Now(),
-                                            Action::ACTION_API_CALL,
-                                            "tabs.testMethod");
-  activity_log->LogAction(action);
-  action = new Action(extension->id(),
-                      base::Time::Now(),
-                      Action::ACTION_DOM_ACCESS,
-                      "document.write");
-  action->set_page_url(GURL("http://www.google.com"));
-
-  activity_log->OnExtensionUninstalled(extension);
-
-  activity_log->GetFilteredActions(
-      extension->id(),
-      Action::ACTION_ANY,
-      "",
-      "",
-      "",
-      0,
-      base::Bind(ActivityLogTest::RetrieveActions_LogAndFetchActions0));
-}
-
 }  // namespace extensions