Revert "Revert 148074 - Pass the render process id to the FrameNavigationState."

chrome/browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc

 // Copyright (c) 2012 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/values.h"
 #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 class FrameNavigationStateTest : public ChromeRenderViewHostTestHarness {
 };
 
 // Test that a frame is correctly tracked, and removed once the tab contents
 // goes away.
 TEST_F(FrameNavigationStateTest, TrackFrame) {
   FrameNavigationState navigation_state;
-  const int64 frame_id1 = 23;
-  const int64 frame_id2 = 42;
+  const FrameNavigationState::FrameID frame_id1(23, 1);
+  const FrameNavigationState::FrameID frame_id2(42, 1);
   const GURL url1("http://www.google.com/");
   const GURL url2("http://mail.google.com/");
 
   // Create a main frame.
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id1));
   EXPECT_FALSE(navigation_state.IsValidFrame(frame_id1));
   navigation_state.TrackFrame(frame_id1, url1, true, false);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1));
   EXPECT_TRUE(navigation_state.IsValidFrame(frame_id1));
 
   // Add a sub frame.
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id2));
   EXPECT_FALSE(navigation_state.IsValidFrame(frame_id2));
   navigation_state.TrackFrame(frame_id2, url2, false, false);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id2));
   EXPECT_TRUE(navigation_state.IsValidFrame(frame_id2));
 
   // Check frame state.
   EXPECT_TRUE(navigation_state.IsMainFrame(frame_id1));
   EXPECT_EQ(url1, navigation_state.GetUrl(frame_id1));
   EXPECT_FALSE(navigation_state.IsMainFrame(frame_id2));
   EXPECT_EQ(url2, navigation_state.GetUrl(frame_id2));
   EXPECT_EQ(frame_id1, navigation_state.GetMainFrameID());
 }
 
 // Test that no events can be sent for a frame after an error occurred, but
 // before a new navigation happened in this frame.
 TEST_F(FrameNavigationStateTest, ErrorState) {
   FrameNavigationState navigation_state;
-  const int64 frame_id = 42;
+  const FrameNavigationState::FrameID frame_id(42, 1);
   const GURL url("http://www.google.com/");
 
   navigation_state.TrackFrame(frame_id, url, true, false);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id));
   EXPECT_FALSE(navigation_state.GetErrorOccurredInFrame(frame_id));
 
   // After an error occurred, no further events should be sent.
   navigation_state.SetErrorOccurredInFrame(frame_id);
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id));
   EXPECT_TRUE(navigation_state.GetErrorOccurredInFrame(frame_id));
 
   // Navigations to a network error page should be ignored.
   navigation_state.TrackFrame(frame_id, GURL(), true, true);
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id));
   EXPECT_TRUE(navigation_state.GetErrorOccurredInFrame(frame_id));
 
   // However, when the frame navigates again, it should send events again.
   navigation_state.TrackFrame(frame_id, url, true, false);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id));
   EXPECT_FALSE(navigation_state.GetErrorOccurredInFrame(frame_id));
 }
 
 // Tests that for a sub frame, no events are send after an error occurred, but
 // before a new navigation happened in this frame.
 TEST_F(FrameNavigationStateTest, ErrorStateFrame) {
   FrameNavigationState navigation_state;
-  const int64 frame_id1 = 23;
-  const int64 frame_id2 = 42;
+  const FrameNavigationState::FrameID frame_id1(23, 1);
+  const FrameNavigationState::FrameID frame_id2(42, 1);
   const GURL url("http://www.google.com/");
 
   navigation_state.TrackFrame(frame_id1, url, true, false);
   navigation_state.TrackFrame(frame_id2, url, false, false);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1));
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id2));
 
   // After an error occurred, no further events should be sent.
   navigation_state.SetErrorOccurredInFrame(frame_id2);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1));
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id2));
 
   // Navigations to a network error page should be ignored.
   navigation_state.TrackFrame(frame_id2, GURL(), false, true);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1));
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id2));
 
   // However, when the frame navigates again, it should send events again.
   navigation_state.TrackFrame(frame_id2, url, false, false);
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id1));
   EXPECT_TRUE(navigation_state.CanSendEvents(frame_id2));
 }
 
 // Tests that no events are send for a not web-safe scheme.
 TEST_F(FrameNavigationStateTest, WebSafeScheme) {
   FrameNavigationState navigation_state;
-  const int64 frame_id = 23;
+  const FrameNavigationState::FrameID frame_id(23, 1);
   const GURL url("unsafe://www.google.com/");
 
   navigation_state.TrackFrame(frame_id, url, true, false);
   EXPECT_FALSE(navigation_state.CanSendEvents(frame_id));
 }
 
 }  // namespace extensions