Move NavigationState to content\public\renderer and put it in the content namespace.

BUG=98716
Review URL: http://codereview.chromium.org/8114019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103826 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 20 insertions, 12 deletions

diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc
index babdf0c..cac0470 100644
--- a/chrome/renderer/content_settings_observer.cc
+++ b/chrome/renderer/content_settings_observer.cc
@@ -8,7 +8,7 @@
 #include "chrome/common/url_constants.h"
 #include "content/common/database_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/navigation_state.h"
+#include "content/public/renderer/navigation_state.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -25,6 +25,7 @@ using WebKit::WebSecurityOrigin;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebView;
+using content::NavigationState;
 
 namespace {
 
diff --git a/chrome/renderer/frame_sniffer.cc b/chrome/renderer/frame_sniffer.cc
index d4c3674..77c29e3 100644
--- a/chrome/renderer/frame_sniffer.cc
+++ b/chrome/renderer/frame_sniffer.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/navigation_state.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 
diff --git a/chrome/renderer/loadtimes_extension_bindings.cc b/chrome/renderer/loadtimes_extension_bindings.cc
index 9005128..b71b027 100644
--- a/chrome/renderer/loadtimes_extension_bindings.cc
+++ b/chrome/renderer/loadtimes_extension_bindings.cc
@@ -7,13 +7,14 @@
 #include <math.h>
 
 #include "base/time.h"
-#include "content/renderer/navigation_state.h"
+#include "content/public/renderer/navigation_state.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "v8/include/v8.h"
 
 using WebKit::WebDataSource;
 using WebKit::WebFrame;
 using WebKit::WebNavigationType;
+using content::NavigationState;
 
 // Values for CSI "tran" property
 const int kTransitionLink = 0;
diff --git a/chrome/renderer/page_load_histograms.cc b/chrome/renderer/page_load_histograms.cc
index 856df40..0c7f82b 100644
--- a/chrome/renderer/page_load_histograms.cc
+++ b/chrome/renderer/page_load_histograms.cc
@@ -13,7 +13,7 @@
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/renderer_histogram_snapshots.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/navigation_state.h"
+#include "content/public/renderer/navigation_state.h"
 #include "content/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -22,12 +22,13 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
-using base::Time;
-using base::TimeDelta;
 using WebKit::WebDataSource;
 using WebKit::WebFrame;
 using WebKit::WebPerformance;
 using WebKit::WebString;
+using base::Time;
+using base::TimeDelta;
+using content::NavigationState;
 
 static const TimeDelta kPLTMin(TimeDelta::FromMilliseconds(10));
 static const TimeDelta kPLTMax(TimeDelta::FromMinutes(10));
@@ -49,7 +50,7 @@ static URLPattern::SchemeMasks GetSupportedSchemeType(const GURL& url) {
 static void DumpWebTiming(const Time& navigation_start,
                           const Time& load_event_start,
                           const Time& load_event_end,
-                          NavigationState* navigation_state) {
+                          content::NavigationState* navigation_state) {
   if (navigation_start.is_null() ||
       load_event_start.is_null() ||
       load_event_end.is_null())
diff --git a/chrome/renderer/page_load_histograms.h b/chrome/renderer/page_load_histograms.h
index be7aa16..88774fc 100644
--- a/chrome/renderer/page_load_histograms.h
+++ b/chrome/renderer/page_load_histograms.h
@@ -8,9 +8,12 @@
 #include "base/basictypes.h"
 #include "content/public/renderer/render_view_observer.h"
 
-class NavigationState;
 class RendererHistogramSnapshots;
 
+namespace content {
+class NavigationState;
+}
+
 class PageLoadHistograms : public content::RenderViewObserver {
  public:
   PageLoadHistograms(RenderView* render_view,
@@ -44,7 +47,7 @@ class PageLoadHistograms : public content::RenderViewObserver {
 
   void ResetCrossFramePropertyAccess();
 
-  void LogPageLoadTime(const NavigationState* state,
+  void LogPageLoadTime(const content::NavigationState* state,
                        const WebKit::WebDataSource* ds) const;
 
   // Site isolation metric counts.
diff --git a/chrome/renderer/prerender/prerender_helper.cc b/chrome/renderer/prerender/prerender_helper.cc
index c998b25..e64fede 100644
--- a/chrome/renderer/prerender/prerender_helper.cc
+++ b/chrome/renderer/prerender/prerender_helper.cc
@@ -7,11 +7,13 @@
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/render_messages.h"
-#include "content/renderer/navigation_state.h"
+#include "content/public/renderer/navigation_state.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
+using content::NavigationState;
+
 // Helper macro for histograms.
 #define RECORD_PLT(tag, perceived_page_load_time) { \
     UMA_HISTOGRAM_CUSTOM_TIMES( \
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index 39b3995..8b43c5f 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -16,7 +16,7 @@
 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
 #include "chrome/renderer/safe_browsing/scorer.h"
-#include "content/renderer/navigation_state.h"
+#include "content/public/renderer/navigation_state.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -24,6 +24,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
+using content::NavigationState;
+
 namespace safe_browsing {
 
 static GURL StripRef(const GURL& url) {
diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
index 77c254d..f73f29a 100644
--- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
+++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
@@ -18,7 +18,6 @@
 #include "content/common/resource_response.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/navigation_state.h"
 #include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/renderer_main_platform_delegate.h"