Remove prerender sessionStorage namespace merging (1/2)

chrome/browser/prerender/prerender_local_predictor.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_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_
 
 #include <map>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/history/visit_database.h"
 #include "components/history/core/browser/history_service_observer.h"
-#include "content/public/browser/session_storage_namespace.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class HistoryService;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
@@ skipping 109 matching lines @@
     EVENT_NAMESPACE_MISMATCH_MERGE_RESULT_NAMESPACE_NOT_ALIAS = 85,
     EVENT_TAB_HELPER_URL_SEEN_MATCH_ENTRY = 86,
     EVENT_TAB_HELPER_URL_SEEN_MATCH_BROWSER_NAVIGATE = 87,
     EVENT_TAB_HELPER_URL_SEEN_NAMESPACE_MATCH_ENTRY = 88,
     EVENT_TAB_HELPER_URL_SEEN_NAMESPACE_MATCH_BROWSER_NAVIGATE = 89,
     EVENT_PREFETCH_LIST_ADDED = 90,
     EVENT_PREFETCH_LIST_SEEN_TABCONTENTS = 91,
     EVENT_PREFETCH_LIST_SEEN_HISTORY = 92,
     EVENT_ISSUE_PRERENDER_CALLED = 93,
     EVENT_ISSUE_PRERENDER_PREFETCH_ENABLED = 94,
     EVENT_ISSUE_PRERENDER_PREFETCH_ISSUED = 95,

[mmenke, 2014/12/12 16:04:48]

I think some of these can be commented out as obsolete...

[davidben, 2014/12/12 20:41:19]

Done. I pruned all the unused ones. Hopefully we can just drop it altogether.
I'm sure none of these are of any use to prefetch.

     EVENT_MAX_VALUE
   };
 
   // A PrerenderLocalPredictor is owned by the PrerenderManager specified
   // in the constructor.  It will be destoryed at the time its owning
   // PrerenderManager is destroyed.
   explicit PrerenderLocalPredictor(PrerenderManager* prerender_manager);
   ~PrerenderLocalPredictor() override;
 
   void Shutdown();
@@ skipping 42 matching lines @@
                       LocalPredictorURLInfo* url_info);
   void MaybeCancelURLFetcher(net::URLFetcher* fetcher);
   // Returns true if the parsed response is semantically correct and could
   // be fully applied.
   bool ApplyParsedPrerenderServiceResponse(
       base::DictionaryValue* dict,
       CandidatePrerenderInfo* info,
       bool* hinting_timed_out,
       bool* hinting_url_lookup_timed_out,
       bool* candidate_url_lookup_timed_out);
-  void ProcessNamespaceMergeResult(
-      content::SessionStorageNamespace::MergeResult result);
   typedef std::map<net::URLFetcher*, CandidatePrerenderInfo*>
       OutstandingFetchers;
   OutstandingFetchers outstanding_prerender_service_requests_;
   PrerenderManager* prerender_manager_;
   base::OneShotTimer<PrerenderLocalPredictor> timer_;
 
   // Delay after which to initialize, to avoid putting to much load on the
   // database thread early on when Chrome is starting up.
   static const int kInitDelayMs = 5 * 1000;
 
@@ skipping 14 matching lines @@
 
   ScopedObserver<HistoryService, HistoryServiceObserver>
       history_service_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderLocalPredictor);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_LOCAL_PREDICTOR_H_