Change decidePolicyForNavigation() to takea WebDataSource::ExtraData

content/public/renderer/document_state.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/supports_user_data.h"
 #include "base/time.h"
+#include "content/common/content_export.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 
 namespace content {
 
 class NavigationState;
 struct PasswordForm;
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
-class DocumentState : public WebKit::WebDataSource::ExtraData,
-                      public base::SupportsUserData {
+class CONTENT_EXPORT DocumentState
+    : NON_EXPORTED_BASE(public WebKit::WebDataSource::ExtraData),
+      public base::SupportsUserData {
  public:
   // The exact values of this enum are used in histograms, so new values must be
   // added to the end.
   enum LoadType {
     UNDEFINED_LOAD,            // Not yet initialized.
     RELOAD,                    // User pressed reload.
     HISTORY_LOAD,              // Back or forward.
     NORMAL_LOAD,               // User entered URL, or omnibox search.
     LINK_LOAD,                 // (deprecated) Included next 4 categories.
     LINK_LOAD_NORMAL,          // Commonly following of link.
@@ skipping 177 matching lines @@
   LoadType load_type_;
 
   scoped_ptr<NavigationState> navigation_state_;
 
   bool can_load_local_resources_;
 };
 
 #endif  // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
 
 }  // namespace content