Replace direct access to kGoogleServicesUsername with calls to SigninManager.

chrome/browser/ui/webui/local_discovery/local_discovery_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/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/local_discovery/test_service_discovery_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/web_ui_browser_test.h"
+#include "chromeos/chromeos_switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 
 #if defined(OS_CHROMEOS)
@@ skipping 322 matching lines @@
         *test_service_discovery_client_.get(),
         OnSendTo(std::string((const char*)kQueryData, sizeof(kQueryData))))
         .Times(AtLeast(2))
         .WillOnce(InvokeWithoutArgs(&condition_devices_listed_,
                                     &TestMessageLoopCondition::Signal))
         .WillRepeatedly(Return());
 
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetForProfile(browser()->profile());
 
-#if defined(OS_CHROMEOS)
-    // Chrome OS initializes prefs::kGoogleServicesUsername to "stub user" so
-    // we need to override it as well.
-    browser()->profile()->GetPrefs()->
-        SetString(prefs::kGoogleServicesUsername, kSampleUser);
-#endif
     DCHECK(signin_manager);
     signin_manager->SetAuthenticatedUsername(kSampleUser);
 
     fake_fetcher_factory().SetFakeResponse(
         GURL(kURLInfo),
         kResponseInfo,
         net::HTTP_OK,
         net::URLRequestStatus::SUCCESS);
 
     fake_fetcher_factory().SetFakeResponse(
@@ skipping 42 matching lines @@
 
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile());
 
     token_service->UpdateCredentials("user@host.com", "MyFakeToken");
 
     AddLibrary(base::FilePath(FILE_PATH_LITERAL("local_discovery_ui_test.js")));
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) override {
+#if defined(OS_CHROMEOS)
+    // On chromeos, don't sign in with the stub-user automatically.  Use the
+    // kLoginUser instead.
+    command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
+                                    kSampleUser);
+    command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
+                                    chrome::kTestUserProfileDir);
+#endif
     WebUIBrowserTest::SetUpCommandLine(command_line);
   }
 
   void RunFor(base::TimeDelta time_period) {
     base::CancelableCallback<void()> callback(base::Bind(
         &base::MessageLoop::Quit, base::Unretained(
             base::MessageLoop::current())));
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, callback.callback(), time_period);
 
@@ skipping 120 matching lines @@
       kAnnouncePacketRegistered, sizeof(kAnnouncePacketRegistered));
 
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_TRUE(WebUIBrowserTest::RunJavascriptTest("expectRegisterDone"));
 }
 
 }  // namespace
 
 }  // namespace local_discovery