Add some browser tests for net-internals

chrome/test/base/ui_test_utils.h

 // Copyright (c) 2011 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_TEST_BASE_UI_TEST_UTILS_H_
 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
 #pragma once
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string16.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/automation/dom_element_proxy.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
@@ skipping 462 matching lines @@
 
 // Watches title changes on a tab, blocking until an expected title is set.
 class TitleWatcher : public NotificationObserver {
  public:
   // |tab_contents| must be non-NULL and needs to stay alive for the
   // entire lifetime of |this|. |expected_title| is the title that |this|
   // will wait for.
   TitleWatcher(TabContents* tab_contents, const string16& expected_title);
   virtual ~TitleWatcher();
 
-  // Waits until the title for the tab is set to the |expected_title|
-  // passed into the constructor.
-  bool Wait() WARN_UNUSED_RESULT;
+  // Adds another title to watch for.
+  void AddTitle(const string16& expected_title);

[Paweł Hajdan Jr., 2011/08/02 21:45:57]

nit: Let's rename this to AlsoWaitForTitle.

[mmenke, 2011/08/03 15:44:17]

Done.

+
+  // Waits until the title matches either expected_title or one of the titles
+  // added with AddTitle.  Returns the value of the most recently seen matching
+  // title.
+  const string16& Wait() WARN_UNUSED_RESULT;

[Paweł Hajdan Jr., 2011/08/02 21:45:57]

nit: Let's rename this to WaitAndGetTitle.

[mmenke, 2011/08/03 15:44:17]

Done.

 
  private:
   // NotificationObserver
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   TabContents* expected_tab_;
-  string16 expected_title_;
+  std::vector<string16> expected_titles_;
   NotificationRegistrar notification_registrar_;
-  bool title_observed_;
+
+  // The most recently observed expected title, if any.
+  string16 observed_title_;
+
+  bool expected_title_observed_;
   bool quit_loop_on_observation_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleWatcher);
 };
 
 // See SendKeyPressAndWait.  This function additionally performs a check on the
 // NotificationDetails using the provided Details<U>.
 template <class U>
 bool SendKeyPressAndWaitWithDetails(
     const Browser* browser,
@@ skipping 72 matching lines @@
 
 // Takes a snapshot of the entire page, according to the width and height
 // properties of the DOM's document. Returns true on success. DOMAutomation
 // must be enabled.
 bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                             SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_UI_TEST_UTILS_H_