Enable ActivityLogApiTest.TriggerEvent and update test

chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

 // Copyright 2013 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 <string>
 
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_builder.h"
@@ skipping 32 matching lines @@
   }
 
  private:
   CommandLine saved_cmdline_;
 };
 
 #if defined(OS_WIN) && !defined(NDEBUG)
 // TODO(karenlees): fix flakiness on win debug - crbug.com/299393
 #define MAYBE_TriggerEvent DISABLED_TriggerEvent
 #else
-// Disabled while waiting for Blink roll to avoid
-// https://codereview.chromium.org/52203002
-#define MAYBE_TriggerEvent DISABLED_TriggerEvent
+#define MAYBE_TriggerEvent TriggerEvent
 #endif
 
 // The test extension sends a message to its 'friend'. The test completes
 // if it successfully sees the 'friend' receive the message.
 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
   ActivityLog::GetInstance(profile())->SetWatchdogAppActive(true);
 
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(StartEmbeddedTestServer());
   embedded_test_server()->RegisterRequestHandler(
       base::Bind(&ActivityLogApiTest::HandleRequest, base::Unretained(this)));
 
   const Extension* friend_extension = LoadExtensionIncognito(
       test_data_dir_.AppendASCII("activity_log_private/friend"));
   ASSERT_TRUE(friend_extension);
   ASSERT_TRUE(RunExtensionTest("activity_log_private/test"));
   ActivityLog::GetInstance(profile())->SetWatchdogAppActive(false);
 }
 
 }  // namespace extensions