5 files changed, 4 insertions, 16 deletions
diff --git a/ios/web/navigation/navigation_manager_impl.h b/ios/web/navigation/navigation_manager_impl.h
index ef09e52..ea5104b 100644
--- a/ios/web/navigation/navigation_manager_impl.h
+++ b/ios/web/navigation/navigation_manager_impl.h
@@ -90,14 +90,13 @@ class NavigationManagerImpl : public NavigationManager {
   // Convenience accessors to get the underlying NavigationItems from the
   // SessionEntries returned from |session_controller_|'s -lastUserEntry and
   // -previousEntry methods.
-  // TODO(marq):Evaluate the long-term utility of these methods.
+  // TODO(crbug.com/546365): Remove these methods.
   NavigationItem* GetLastUserItem() const;
   NavigationItem* GetPreviousItem() const;
 
   // Temporary method. Returns a vector of NavigationItems corresponding to
   // the SessionEntries of the uderlying CRWSessionController.
-  // TOOD(marq): Remove this method and unfork its caller,
-  //     TabRestoreServiceHelper::PopulateTab
+  // TODO(crbug.com/546365): Remove this method.
   std::vector<NavigationItem*> GetItems();
 
   // NavigationManager:
@@ -126,8 +125,6 @@ class NavigationManagerImpl : public NavigationManager {
 
   // Copy state from |navigation_manager|, including a copy of that object's
   // CRWSessionController.
-  // TODO(marq): This doesn't deep-copy the SessionEntries in the
-  // CRWSessionController.
   void CopyState(NavigationManagerImpl* navigation_manager);
  private:
   // The primary delegate for this manager.
diff --git a/ios/web/net/clients/crw_passkit_network_client_unittest.mm b/ios/web/net/clients/crw_passkit_network_client_unittest.mm
index ea71b63..0160b82 100644
--- a/ios/web/net/clients/crw_passkit_network_client_unittest.mm
+++ b/ios/web/net/clients/crw_passkit_network_client_unittest.mm
@@ -34,8 +34,7 @@ class CRWPassKitNetworkClientTest : public testing::Test {
         niceMockForProtocol:@protocol(CRWPassKitDelegate)] retain]);
 
     // The request tracker needs to be set up with a unique tab id.
-    // TODO(marq): This can just be a mock or stub; it doesn't need to be a full
-    // RT instance.
+
     static int gcount = 0;
     request_group_id_.reset(
         [[NSString stringWithFormat:@"passkittest%d", gcount++] retain]);
diff --git a/ios/web/net/request_tracker_impl.mm b/ios/web/net/request_tracker_impl.mm
index 13ec603..c96930b2 100644
--- a/ios/web/net/request_tracker_impl.mm
+++ b/ios/web/net/request_tracker_impl.mm
@@ -664,7 +664,6 @@ void RequestTrackerImpl::ErrorCallback(CRWSSLCarrier* carrier, bool allow) {
 
 #pragma mark Client utility methods.
 
-// TODO(marq): Convert all internal task-posting to use these.
 void RequestTrackerImpl::PostUITaskIfOpen(const base::Closure& task) {
   PostTask(task, web::WebThread::UI);
 }
@@ -766,8 +765,6 @@ void RequestTrackerImpl::Destruct() {
 }
 
 #pragma mark Other private methods
-// TODO(marq): Reorder method implementations to match header and add grouping
-// marks/comments.
 
 void RequestTrackerImpl::Notify() {
   DCHECK_CURRENTLY_ON_WEB_THREAD(web::WebThread::IO);
diff --git a/ios/web/web_state/ui/crw_static_file_web_view.h b/ios/web/web_state/ui/crw_static_file_web_view.h
index 1b7e54d..ba0a207 100644
--- a/ios/web/web_state/ui/crw_static_file_web_view.h
+++ b/ios/web/web_state/ui/crw_static_file_web_view.h
@@ -26,9 +26,6 @@ class BrowserState;
 
 // Returns whether the request should be allowed for rendering into a
 // special UIWebView that allows static file content.
-// TODO(marq): Since this is only used to inject a FileRequestVerfier into
-// HttpProtocolHandler, instead make this a method that returns a block of
-// that type.
 + (BOOL)isStaticFileRequest:(NSURLRequest*)request;
 
 @end
diff --git a/ios/web/web_state/web_state_impl.h b/ios/web/web_state/web_state_impl.h
index dfdee5d..3abaee3 100644
--- a/ios/web/web_state/web_state_impl.h
+++ b/ios/web/web_state/web_state_impl.h
@@ -71,9 +71,7 @@ class WebStateImpl : public WebState, public NavigationManagerDelegate {
   // controller, or facade set, but which otherwise has the same state variables
   // as the calling object (including copies of the NavigationManager and its
   // attendant CRWSessionController).
-  // TODO(marq): Revisit this function and the ownership model described above;
-  // too this depends on and interacts directly with above-the-web-level
-  // information.
+  // TODO(crbug.com/546377): Clean up this method.
   WebStateImpl* CopyForSessionWindow();
 
   // Notifies the observers that a provisional navigation has started.