Revert "Ensure that the browser’s copy of page id is in sync with the renderer’s."

This reverts commit 86823cbf672c0840146a93dc1d2217f01a9d6909.

BUG=407376
TBR=rsesek@chromium.org

Review URL: https://codereview.chromium.org/566593002

Cr-Commit-Position: refs/heads/master@{#294432}

3 files changed, 4 insertions, 48 deletions

diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc
index a5ad0f9..09f7e19 100644
--- a/chrome/common/crash_keys.cc
+++ b/chrome/common/crash_keys.cc
@@ -166,13 +166,6 @@ size_t RegisterChromeCrashKeys() {
     { "channel_error_bt", kMediumSize },
     { "remove_route_bt", kMediumSize },
     { "rwhvm_window", kMediumSize },
-    // The following keys are for diagnosing crashes in http://crbug.com/369661.
-    // They will not be permanent.
-    { "url1", kLargeSize },
-    { "url2", kLargeSize },
-    { "id1", kSmallSize },
-    { "id2", kSmallSize },
-    // End http://crbug.com/369661
     // media/:
     { "VideoCaptureDeviceQTKit", kSmallSize },
 #endif
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index e4b677a..b5bff3e 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -7,11 +7,9 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
-#include "base/debug/crash_logging.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/user_metrics_action.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/accessibility/accessibility_mode_helper.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
@@ -612,19 +610,8 @@ void RenderFrameHostImpl::OnDidRedirectProvisionalLoad(
     int32 page_id,
     const GURL& source_url,
     const GURL& target_url) {
-  if (render_view_host_->page_id_ != page_id) {
-    base::debug::SetCrashKeyValue("url1",
-                                  source_url.possibly_invalid_spec());
-    base::debug::SetCrashKeyValue("url2",
-                                  target_url.possibly_invalid_spec());
-    base::debug::SetCrashKeyValue(
-        "id1", base::IntToString(render_view_host_->page_id_));
-    base::debug::SetCrashKeyValue("id2",
-                                  base::IntToString(page_id));
-    CHECK(false);
-  }
   frame_tree_node_->navigator()->DidRedirectProvisionalLoad(
-      this, render_view_host_->page_id_, source_url, target_url);
+      this, page_id, source_url, target_url);
 }
 
 // Called when the renderer navigates.  For every frame loaded, we'll get this
@@ -985,15 +972,6 @@ void RenderFrameHostImpl::OnUpdateTitle(
     int32 page_id,
     const base::string16& title,
     blink::WebTextDirection title_direction) {
-  if (render_view_host_->page_id_ != page_id) {
-    base::debug::SetCrashKeyValue(
-        "url1", GetLastCommittedURL().possibly_invalid_spec());
-    base::debug::SetCrashKeyValue(
-        "id1", base::IntToString(render_view_host_->page_id_));
-    base::debug::SetCrashKeyValue("id2",
-                                  base::IntToString(page_id));
-    CHECK(false);
-  }
   // This message is only sent for top-level frames. TODO(avi): when frame tree
   // mirroring works correctly, add a check here to enforce it.
   if (title.length() > kMaxTitleChars) {
@@ -1001,7 +979,7 @@ void RenderFrameHostImpl::OnUpdateTitle(
     return;
   }
 
-  delegate_->UpdateTitle(this, render_view_host_->page_id_, title,
+  delegate_->UpdateTitle(this, page_id, title,
                          WebTextDirectionToChromeTextDirection(
                              title_direction));
 }
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 121b140..42707c47 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -11,14 +11,12 @@
 
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/debug/crash_logging.h"
 #include "base/debug/trace_event.h"
 #include "base/i18n/rtl.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
@@ -1090,13 +1088,6 @@ void RenderViewHostImpl::OnRenderProcessGone(int status, int exit_code) {
 }
 
 void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) {
-  if (page_id_ != page_id) {
-    base::debug::SetCrashKeyValue(
-        "url1", GetMainFrame()->GetLastCommittedURL().possibly_invalid_spec());
-    base::debug::SetCrashKeyValue("id1", base::IntToString(page_id_));
-    base::debug::SetCrashKeyValue("id2", base::IntToString(page_id));
-    CHECK(false);
-  }
   // Without this check, the renderer can trick the browser into using
   // filenames it can't access in a future session restore.
   if (!CanAccessFilesOfPageState(state)) {
@@ -1104,18 +1095,12 @@ void RenderViewHostImpl::OnUpdateState(int32 page_id, const PageState& state) {
     return;
   }
 
-  delegate_->UpdateState(this, page_id_, state);
+  delegate_->UpdateState(this, page_id, state);
 }
 
 void RenderViewHostImpl::OnUpdateTargetURL(int32 page_id, const GURL& url) {
-  if (page_id_ != page_id) {
-    base::debug::SetCrashKeyValue("url1", url.possibly_invalid_spec());
-    base::debug::SetCrashKeyValue("id1", base::IntToString(page_id_));
-    base::debug::SetCrashKeyValue("id2", base::IntToString(page_id));
-    CHECK(false);
-  }
   if (IsRVHStateActive(rvh_state_))
-    delegate_->UpdateTargetURL(page_id_, url);
+    delegate_->UpdateTargetURL(page_id, url);
 
   // Send a notification back to the renderer that we are ready to
   // receive more target urls.