Rework arguments of HistoryService::AddPage()

chrome/browser/instant/instant_loader.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 CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
+#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/instant/instant_commit_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 struct InstantAutocompleteResult;
 class InstantLoaderDelegate;
 class TabContents;
 
 namespace content {
 class NotificationDetails;
 class NotificationSource;
 class WebContents;
 }
 
 namespace gfx {
 class Rect;
 }
 
-namespace history {
-class HistoryAddPageArgs;
-}
-
 // InstantLoader is created with an "Instant URL". It loads the URL and tells
 // its delegate (usually InstantController) of all interesting events. For
 // example, it determines if the page actually supports the Instant API
 // (http://dev.chromium.org/searchbox) and forwards messages (such as queries
 // and autocomplete suggestions) between the page and the delegate.
 class InstantLoader : public content::NotificationObserver {
  public:
   // Creates a new empty WebContents. Use Init() to actually load |instant_url|.
   // |tab_contents| is the page the preview will be shown on top of and
   // potentially replace. |instant_url| is typically the instant_url field of
@@ skipping 41 matching lines @@
   // Returns true if the preview page is known to support the Instant API. This
   // starts out false, and becomes true whenever we get any message from the
   // page. Once true, it never becomes false (the page isn't expected to drop
   // Instant API support suddenly).
   bool supports_instant() const { return supports_instant_; }
 
   // Returns the URL that we're loading.
   const std::string& instant_url() const { return instant_url_; }
 
   // Returns info about the last navigation by the Instant page. If the page
-  // hasn't navigated since the last Update(), this contains NULL.
-  scoped_refptr<history::HistoryAddPageArgs> last_navigation() const {
+  // hasn't navigated since the last Update(), the URL is empty.
+  const history::HistoryAddPageArgs& last_navigation() const {
     return last_navigation_;
   }
 
   // Returns true if the mouse or a touch pointer is down due to activating the
   // preview content.
   bool IsPointerDownFromActivate() const;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
@@ skipping 19 matching lines @@
   // See comments on the getter above.
   bool supports_instant_;
 
   // See comments on the getter above.
   const std::string instant_url_;
 
   // Used to get notifications about renderers coming and going.
   content::NotificationRegistrar registrar_;
 
   // See comments on the getter above.
-  scoped_refptr<history::HistoryAddPageArgs> last_navigation_;
+  history::HistoryAddPageArgs last_navigation_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_