content_shell: Fix a regression for paths starting with /media/.

components/test_runner/test_runner.h

 // Copyright 2014 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 COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 114 matching lines @@
   bool shouldDumpTitleChanges() const;
   bool shouldDumpIconChanges() const;
   bool shouldDumpCreateView() const;
   bool canOpenWindows() const;
   bool shouldDumpResourceLoadCallbacks() const;
   bool shouldDumpResourceResponseMIMETypes() const;
   bool shouldDumpStatusCallbacks() const;
   bool shouldDumpSpellCheckCallbacks() const;
   bool shouldWaitUntilExternalURLLoad() const;
   const std::set<std::string>* httpHeadersToClear() const;
+  bool did_request_after_reset() const { return did_request_after_reset_; }
+  void set_did_request_after_reset() { did_request_after_reset_ = true; }
 
   // To be called when |frame| starts loading - TestRunner will check if
   // there is currently no top-loading-frame being tracked and if so, then it
   // will return true and start tracking |frame| as the top-loading-frame.
   bool tryToSetTopLoadingFrame(blink::WebFrame* frame);
 
   // To be called when |frame| finishes loading - TestRunner will check if
   // |frame| is currently tracked as the top-loading-frame, and if yes, then it
   // will return true, stop top-loading-frame tracking, and potentially finish
   // the test (unless testRunner.waitUntilDone() was called and/or there are
@@ skipping 485 matching lines @@
   // Captured drag image.
   blink::WebImage drag_image_;
 
   // View that was focused by a previous call to TestRunner::SetFocus method.
   // Note - this can be a dangling pointer to an already destroyed WebView (this
   // is ok, because this is taken care of in WebTestDelegate::SetFocus).
   blink::WebView* previously_focused_view_;
 
   std::set<blink::WebWidget*> widgets_with_scheduled_animations_;
 
+  // True if we requested any resource after Reset().
+  bool did_request_after_reset_;
+
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_