Make sure content area is focused when signin-view bubble is opened.

chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 51 matching lines @@
   cache->SetAuthInfoOfProfileAtIndex(cache->GetIndexOfProfileWithPath(
     signed_in->GetPath()), "12345", base::UTF8ToUTF16(signed_in_email));
   signed_in->GetPrefs()->
       SetString(prefs::kGoogleServicesHostedDomain, "google.com");
   cache->SetSupervisedUserIdOfProfileAtIndex(cache->GetIndexOfProfileWithPath(
     supervised->GetPath()), signed_in_email);
 
   EXPECT_TRUE(profiles::IsLockAvailable(signed_in));
 }
 
+views::View* FindWebView(views::View* view) {
+  std::queue<views::View*> queue;
+  queue.push(view);
+  while (!queue.empty()) {
+    views::View* current = queue.front();
+    queue.pop();
+    if (std::string(current->GetClassName()).find("WebView") !=

[Nico, 2015/07/02 20:07:22]

Can you introduce WebView::kViewClassName and compare to that? (cf FindTabView()
in tab_strip_unittest.cc)

[wjmaclean, 2015/07/02 20:47:18]

Done.

+        std::string::npos) {
+      return current;
+    }
+
+    for (int i = 0; i < current->child_count(); ++i)
+      queue.push(current->child_at(i));
+  }
+  return nullptr;
+}
+
 }  // namespace
 
 class ProfileChooserViewExtensionsTest : public ExtensionBrowserTest {
  public:
   ProfileChooserViewExtensionsTest() {}
   ~ProfileChooserViewExtensionsTest() override {}
 
  protected:
   void SetUp() override {
     ExtensionBrowserTest::SetUp();
@@ skipping 59 matching lines @@
     // the UserManager is created and wait for that event.
     if (!UserManager::IsShowing())
       base::MessageLoop::current()->RunUntilIdle();
     EXPECT_TRUE(UserManager::IsShowing());
   }
 
   content::WindowedNotificationObserver* window_close_observer() {
     return window_close_observer_.get();
   }
 
+  ProfileChooserView* current_profile_bubble() {
+    return ProfileChooserView::profile_bubble_;
+  }
+
+  void ShowSigninView() {
+    DCHECK(current_profile_bubble());
+    DCHECK(current_profile_bubble()->avatar_menu_);
+    current_profile_bubble()->ShowView(
+        profiles::BUBBLE_VIEW_MODE_GAIA_SIGNIN,
+        current_profile_bubble()->avatar_menu_.get());
+    base::MessageLoop::current()->RunUntilIdle();
+  }
+
  private:
   scoped_ptr<content::WindowedNotificationObserver> window_close_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserViewExtensionsTest);
 };
 
+// crbug.com/502370
+IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, ContentAreaHasFocus) {
+  ASSERT_TRUE(profiles::IsMultipleProfilesEnabled());
+
+  ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser()));
+
+  ShowSigninView();
+
+  ASSERT_TRUE(current_profile_bubble());
+  views::View* web_view = FindWebView(current_profile_bubble());
+  ASSERT_TRUE(web_view);
+  EXPECT_TRUE(web_view->HasFocus());
+}
+
 IN_PROC_BROWSER_TEST_F(ProfileChooserViewExtensionsTest, ViewProfileUMA) {
   ASSERT_TRUE(profiles::IsMultipleProfilesEnabled());
 
   base::HistogramTester histograms;
   Profile* profile = browser()->profile();
   profile->GetPrefs()->SetInteger(prefs::kProfileAvatarTutorialShown, 0);
 
   ASSERT_NO_FATAL_FAILURE(OpenProfileChooserView(browser()));
 
   histograms.ExpectUniqueSample("Profile.NewAvatarMenu.Upgrade",
@@ skipping 73 matching lines @@
   WaitForUserManager();
   // Assert that the first profile's extensions are not blocked.
   ASSERT_EQ(total_enabled_extensions, registry->enabled_extensions().size());
   ASSERT_EQ(0U, registry->blocked_extensions().size());
 
   // We need to hide the User Manager or else the process can't die.
   UserManager::Hide();
 }
 
 #endif