Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch...

chrome/test/automation/automation_messages.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
 #define CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
@@ skipping 433 matching lines @@
   }
 };
 
 struct NavigationInfo {
   int navigation_type;
   int relative_offset;
   int navigation_index;
   std::wstring title;
   GURL url;
   SecurityStyle security_style;
-  bool has_mixed_content;
+  bool displayed_mixed_content;
+  bool ran_mixed_content;
 };
 
 // Traits for NavigationInfo structure to pack/unpack.
 template <>
 struct ParamTraits<NavigationInfo> {
   typedef NavigationInfo param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.navigation_type);
     WriteParam(m, p.relative_offset);
     WriteParam(m, p.navigation_index);
     WriteParam(m, p.title);
     WriteParam(m, p.url);
     WriteParam(m, p.security_style);
-    WriteParam(m, p.has_mixed_content);
+    WriteParam(m, p.displayed_mixed_content);
+    WriteParam(m, p.ran_mixed_content);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return ReadParam(m, iter, &p->navigation_type) &&
            ReadParam(m, iter, &p->relative_offset) &&
            ReadParam(m, iter, &p->navigation_index) &&
            ReadParam(m, iter, &p->title) &&
            ReadParam(m, iter, &p->url) &&
            ReadParam(m, iter, &p->security_style) &&
-           ReadParam(m, iter, &p->has_mixed_content);
+           ReadParam(m, iter, &p->displayed_mixed_content) &&
+           ReadParam(m, iter, &p->ran_mixed_content);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
     LogParam(p.navigation_type, l);
     l->append(L", ");
     LogParam(p.relative_offset, l);
     l->append(L", ");
     LogParam(p.navigation_index, l);
     l->append(L", ");
     LogParam(p.title, l);
     l->append(L", ");
     LogParam(p.url, l);
     l->append(L", ");
     LogParam(p.security_style, l);
     l->append(L", ");
-    LogParam(p.has_mixed_content, l);
+    LogParam(p.displayed_mixed_content, l);
+    l->append(L", ");
+    LogParam(p.ran_mixed_content, l);
     l->append(L")");
   }
 };
 
 // A stripped down version of ContextMenuParams in webkit/glue/context_menu.h.
 struct ContextMenuParams {
   // The x coordinate for displaying the menu.
   int screen_x;
 
   // The y coordinate for displaying the menu.
@@ skipping 103 matching lines @@
   }
 };
 
 }  // namespace IPC
 
 #define MESSAGES_INTERNAL_FILE \
     "chrome/test/automation/automation_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__