Better ActivityLog error handling

chrome/browser/extensions/activity_log/activity_log_unittest.cc

Index: chrome/browser/extensions/activity_log/activity_log_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index e8a3492234d0b69741f54e009f27374354482c0b..24d8e5c4adc3ef42129e165268c136b48bdc8842 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -50,9 +50,6 @@ class ActivityLogTest : public testing::Test {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogTesting);
     ActivityLog::RecomputeLoggingIsEnabled();
-    extension_service_ = static_cast<TestExtensionSystem*>(
-            ExtensionSystem::Get(profile_.get()))->CreateExtensionService(
-                &command_line, base::FilePath(), false);
   }
 
   virtual ~ActivityLogTest() {
@@ -62,8 +59,9 @@ class ActivityLogTest : public testing::Test {
     base::RunLoop().RunUntilIdle();
     profile_.reset(NULL);
     // Restore the original command line and undo the affects of SetUp().
-    *CommandLine::ForCurrentProcess() = saved_cmdline_;
-    ActivityLog::RecomputeLoggingIsEnabled();
+    // TODO(felt): Reinstate this when I'm done testing this issue!
+    //*CommandLine::ForCurrentProcess() = saved_cmdline_;
+    //ActivityLog::RecomputeLoggingIsEnabled();
   }
 
   static void RetrieveActions_LogAndFetchActions(
@@ -113,14 +111,6 @@ TEST_F(ActivityLogTest, Enabled) {
 }
 
 TEST_F(ActivityLogTest, Construct) {
-  scoped_refptr<const Extension> extension =
-      ExtensionBuilder()
-          .SetManifest(DictionaryBuilder()
-                       .Set("name", "Test extension")
-                       .Set("version", "1.0.0")
-                       .Set("manifest_version", 2))
-          .Build();
-  extension_service_->AddExtension(extension);
   ActivityLog* activity_log = ActivityLog::GetInstance(profile_.get());
   scoped_ptr<ListValue> args(new ListValue());
   ASSERT_TRUE(ActivityLog::IsLogEnabled());
@@ -164,14 +154,6 @@ TEST_F(ActivityLogTest, LogWithoutArguments) {
 }
 
 TEST_F(ActivityLogTest, LogWithArguments) {
-  scoped_refptr<const Extension> extension =
-      ExtensionBuilder()
-          .SetManifest(DictionaryBuilder()
-                       .Set("name", "Test extension")
-                       .Set("version", "1.0.0")
-                       .Set("manifest_version", 2))
-          .Build();
-  extension_service_->AddExtension(extension);
   ActivityLog* activity_log = ActivityLog::GetInstance(profile_.get());
   ASSERT_TRUE(ActivityLog::IsLogEnabled());