Add some browser tests for net-internals

chrome/test/base/ui_test_utils.cc

 // 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.
 
 #include "chrome/test/base/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 884 matching lines @@
     if (running_)
       MessageLoopForUI::current()->Quit();
   } else {
     sources_seen_.insert(source.map_key());
   }
 }
 
 TitleWatcher::TitleWatcher(TabContents* tab_contents,
                            const string16& expected_title)
     : expected_tab_(tab_contents),
-      expected_title_(expected_title),
-      title_observed_(false),
+      expected_title_observed_(false),
       quit_loop_on_observation_(false) {
   EXPECT_TRUE(tab_contents != NULL);
+  expected_titles_.push_back(expected_title);
   notification_registrar_.Add(this,
                               content::NOTIFICATION_TAB_CONTENTS_TITLE_UPDATED,
                               Source<TabContents>(tab_contents));
 }
 
+void TitleWatcher::AddTitle(const string16& expected_title) {
+  expected_titles_.push_back(expected_title);
+}
+
 TitleWatcher::~TitleWatcher() {
 }
 
-bool TitleWatcher::Wait() {
-  if (title_observed_)
-    return true;
+const string16& TitleWatcher::Wait() {
+  if (expected_title_observed_)
+    return observed_title_;
   quit_loop_on_observation_ = true;
   ui_test_utils::RunMessageLoop();
-  return title_observed_;
+  return observed_title_;
 }
 
 void TitleWatcher::Observe(int type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   if (type != content::NOTIFICATION_TAB_CONTENTS_TITLE_UPDATED)
     return;
 
   TabContents* source_contents = Source<TabContents>(source).ptr();
   ASSERT_EQ(expected_tab_, source_contents);
-  if (source_contents->GetTitle() != expected_title_)
-    return;
-
-  title_observed_ = true;
-  if (quit_loop_on_observation_)
-    MessageLoopForUI::current()->Quit();
+  for (std::vector<string16>::const_iterator it = expected_titles_.begin();

[eroman, 2011/08/03 00:32:24]

[optional] If you prefer, could also used std::find() for this:

std::vector<string16>::const_iterator it = std::find(expected_titles_.begin(),
expected_titles_.end(), source_contents->GetTitle());

if (it != expected_titles_.end()) {
  ....
}

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

Good idea, done.

+       it != expected_titles_.end();
+       ++it) {
+    if (*it == source_contents->GetTitle()) {
+      observed_title_ = source_contents->GetTitle();

[eroman, 2011/08/03 00:32:24]

BTW I don't know anything about the GetTitle() function, but presumably it can't
change while calling it from this thread?

If that weren't the case, I suggest copying it into a temporary variable to
avoid confusion.

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

It can't change, but switching to using .find() results in only one call,
anyways.

+      expected_title_observed_ = true;
+      if (quit_loop_on_observation_)
+        MessageLoopForUI::current()->Quit();
+      return;
+    }
+  }
 }
 
 DOMMessageQueue::DOMMessageQueue() {
   registrar_.Add(this, chrome::NOTIFICATION_DOM_OPERATION_RESPONSE,
                  NotificationService::AllSources());
 }
 
 DOMMessageQueue::~DOMMessageQueue() {}
 
 void DOMMessageQueue::Observe(int type,
@@ skipping 94 matching lines @@
   return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
 }
 
 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
   DCHECK(bitmap);
   SnapshotTaker taker;
   return taker.TakeEntirePageSnapshot(rvh, bitmap);
 }
 
 }  // namespace ui_test_utils