Clean up LoginUIService. Remove Singleton behavior from PeopleHandler

chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 104 matching lines @@
 
 // Mock the TestChromeWebUIControllerFactory::WebUIProvider to prove that we are
 // not called as expected.
 class FooWebUIProvider
     : public TestChromeWebUIControllerFactory::WebUIProvider {
  public:
   MOCK_METHOD2(NewWebUI, content::WebUIController*(content::WebUI* web_ui,
                                                    const GURL& url));
 };
 
-class MockLoginUIObserver : public LoginUIService::Observer {
- public:
-  MOCK_METHOD0(OnUntrustedLoginUIShown, void());
-};
-
 const char kFooWebUIURL[] = "chrome://foo/";
 
 bool AddToSet(std::set<content::WebContents*>* set,
               content::WebContents* web_contents) {
   set->insert(web_contents);
   return false;
 }
 
 // This class is used to mock out virtual methods with side effects so that
 // tests below can ensure they are called without causing side effects.
@@ skipping 713 matching lines @@
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(content::ExecuteScript(
       contents, "window.location.href = 'chrome://foo'"));
 
   content::TestNavigationObserver navigation_observer(contents, 1);
   navigation_observer.Wait();
 
   EXPECT_EQ(GURL("about:blank"), contents->GetVisibleURL());
 }
-
-// Flaky on win_chromium_x64_rel_ng: http://crbug605357
-#if !defined(OS_WIN)
-IN_PROC_BROWSER_TEST_F(InlineLoginUISafeIframeBrowserTest,
-    ConfirmationRequiredForNonsecureSignin) {
-  FakeGaia fake_gaia;
-  fake_gaia.Initialize();
-
-  embedded_test_server()->RegisterRequestHandler(
-      base::Bind(&FakeGaia::HandleRequest,
-                 base::Unretained(&fake_gaia)));
-  fake_gaia.SetFakeMergeSessionParams(
-      "email@gmail.com", "fake-sid-cookie", "fake-lsid-cookie");
-
-  // Navigates to the Chrome signin page which loads the fake gaia auth page.
-  // Since the fake gaia auth page is served over HTTP, thus expects to see an
-  // untrusted signin confirmation dialog upon submitting credentials below.
-  ui_test_utils::NavigateToURL(browser(), GetSigninPromoURL());
-  WaitUntilUIReady(browser());
-
-  MockLoginUIObserver observer;
-  LoginUIServiceFactory::GetForProfile(browser()->profile())
-      ->AddObserver(&observer);
-  base::RunLoop run_loop;
-  EXPECT_CALL(observer, OnUntrustedLoginUIShown())
-      .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
-
-  ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password");
-  run_loop.Run();
-  base::RunLoop().RunUntilIdle();
-}
-#endif  // OS_WIN