[Activity log] Expose URL incognito state to private API

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 11 matching lines @@
 // Only the prerender tests are in this file. To add tests for activity
 // logging please see:
 //    chrome/test/data/extensions/api_test/activity_log_private/README
 
 class ActivityLogPrerenderTest : public ExtensionApiTest {
  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(
       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(
-        "ID=%s CATEGORY=content_script API= ARGS=[\"/google_cs.js\"] "
-        "PAGE_URL=http://www.google.com.bo:%d/test.html "
-        "PAGE_TITLE=\"www.google.com.bo:%d/test.html\" "
-        "OTHER={\"prerender\":true}",
-        extension_id.c_str(), port, port);
-    // TODO: Replace PrintForDebug with field testing
-    // when this feature will be available
-    ASSERT_EQ(args, last->PrintForDebug());
+    ASSERT_EQ(Action::ACTION_CONTENT_SCRIPT, last->action_type());
+    ASSERT_EQ("[\"/google_cs.js\"]",
+              ActivityLogPolicy::Util::Serialize(last->args()));
+    ASSERT_EQ(base::StringPrintf("http://www.google.com.bo:%d/test.html", port),
+              last->page_url().spec());
+    ASSERT_EQ("{\"prerender\":true}",
+              ActivityLogPolicy::Util::Serialize(last->other()));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) {
   host_resolver()->AddRule("*", "127.0.0.1");
   StartEmbeddedTestServer();
   int port = embedded_test_server()->port();
 
   // Get the extension (chrome/test/data/extensions/activity_log)
   const Extension* ext =
@@ skipping 35 matching lines @@
 
   activity_log->GetActions(
       ext->id(), 0, base::Bind(
           ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port));
 
   // Allow invocation of Prerender_Arguments
   base::MessageLoop::current()->Run();
 }
 
 }  // namespace extensions