Relanding the language detection.

chrome/test/ui_test_utils.cc

 // Copyright (c) 2009 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/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
@@ skipping 236 matching lines @@
                        const NotificationDetails& details) {
     MessageLoopForUI::current()->Quit();
   }
 
  private:
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleNotificationObserver);
 };
 
+class LanguageDetectionNotificationObserver : public NotificationObserver {
+ public:
+  explicit LanguageDetectionNotificationObserver(
+      RenderViewHost* render_view_host) {
+    registrar_.Add(this, NotificationType::TAB_LANGUAGE_DETERMINED,
+                  Source<RenderViewHost>(render_view_host));
+    ui_test_utils::RunMessageLoop();
+  }
+
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    language_ = *(Details<std::string>(details).ptr());
+    MessageLoopForUI::current()->Quit();
+  }
+
+  std::string language() const {
+    return language_;
+  }
+
+ private:
+  NotificationRegistrar registrar_;
+  std::string language_;
+
+  DISALLOW_COPY_AND_ASSIGN(LanguageDetectionNotificationObserver);
+};
+
 class FindInPageNotificationObserver : public NotificationObserver {
  public:
   explicit FindInPageNotificationObserver(TabContents* parent_tab)
       : parent_tab_(parent_tab),
         active_match_ordinal_(-1),
         number_of_matches_(0) {
     current_find_request_id_ = parent_tab->current_find_request_id();
     registrar_.Add(this, NotificationType::FIND_RESULT_AVAILABLE,
                    Source<TabContents>(parent_tab_));
     ui_test_utils::RunMessageLoop();
@@ skipping 210 matching lines @@
   SimpleNotificationObserver<RenderViewHost>
       focus_observer(NotificationType::FOCUS_CHANGED_IN_PAGE, rvh);
 }
 
 void WaitForFocusInBrowser(Browser* browser) {
   SimpleNotificationObserver<Browser>
       focus_observer(NotificationType::FOCUS_RETURNED_TO_BROWSER,
       browser);
 }
 
+std::string WaitForLanguageDetection(TabContents* tab) {
+  LanguageDetectionNotificationObserver observer(tab->render_view_host());
+  return observer.language();
+}
+
 int FindInPage(TabContents* tab_contents, const string16& search_string,
                bool forward, bool match_case, int* ordinal) {
   tab_contents->StartFinding(search_string, forward, match_case);
   FindInPageNotificationObserver observer(tab_contents);
   if (ordinal)
     *ordinal = observer.active_match_ordinal();
   return observer.number_of_matches();
 }
 
 void RegisterAndWait(NotificationType::Type type,
@@ skipping 27 matching lines @@
   quit_loop_invoked_ = true;
   loop_->PostTask(FROM_HERE, new MessageLoop::QuitTask);
 }
 
 void TimedMessageLoopRunner::QuitAfter(int ms) {
   quit_loop_invoked_ = true;
   loop_->PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask, ms);
 }
 
 }  // namespace ui_test_utils