Extension activity log database refactoring (step 2)

chrome/browser/extensions/activity_log/activity_log_browsertest.cc

 // Copyright (c) 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 "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 16 matching lines @@
  protected:
   // Make sure the activity log is turned on.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExtensionActivityLogging);
     command_line->AppendSwitch(switches::kEnableExtensionActivityLogTesting);
     command_line->AppendSwitchASCII(switches::kPrerenderMode,
                                     switches::kPrerenderModeSwitchValueEnabled);
   }
 
-  static void Prerender_Arguments(int port,
+  static void Prerender_Arguments(
+      const std::string& extension_id,
+      int port,
       scoped_ptr<std::vector<scoped_refptr<Action> > > i) {
     // This is to exit RunLoop (base::MessageLoop::current()->Run()) below
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::MessageLoop::QuitClosure());
 
     ASSERT_TRUE(i->size());
     scoped_refptr<Action> last = i->front();
 
     std::string args = base::StringPrintf(
-        "Injected scripts (\"/google_cs.js \") "
-        "onto http://www.google.com.bo:%d/test.html (prerender)",
-        port);
+        "ID=%s CATEGORY=content_script API= "
+        "ARGS=[\"\\\"/google_cs.js \\\"\"] "
+        "PAGE_URL=http://www.google.com.bo:%d/test.html OTHER={\"dom_verb\":3,\"extra\":\"(prerender)\",\"page_title\":\"www.google.com.bo:%d/test.html\"}",

[felt, 2013/07/18 17:09:59]

line wrap

[mvrable, 2013/07/18 18:20:34]

Done.

+        extension_id.c_str(), port, port);
     // TODO: Replace PrintForDebug with field testing
     // when this feature will be available
     ASSERT_EQ(args, last->PrintForDebug());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) {
   host_resolver()->AddRule("*", "127.0.0.1");
   StartEmbeddedTestServer();
   int port = embedded_test_server()->port();
@@ skipping 31 matching lines @@
   scoped_ptr<prerender::PrerenderHandle> prerender_handle(
       prerender_manager->AddPrerenderFromLocalPredictor(
           url,
           web_contents->GetController().GetSessionStorageNamespace(),
           kSize));
 
   page_observer.Wait();
 
   activity_log->GetActions(
       ext->id(), 0, base::Bind(
-          ActivityLogPrerenderTest::Prerender_Arguments, port));
+          ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port));
 
   // Allow invocation of Prerender_Arguments
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace extensions