Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(719)

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/prefs/pref_service.h"
11 #include "base/run_loop.h" 10 #include "base/run_loop.h"
12 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/chromeos/login/existing_user_controller.h" 13 #include "chrome/browser/chromeos/login/existing_user_controller.h"
15 #include "chrome/browser/chromeos/login/test/oobe_base_test.h" 14 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
16 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 15 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
17 #include "chrome/browser/chromeos/login/wizard_controller.h" 16 #include "chrome/browser/chromeos/login/wizard_controller.h"
18 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 17 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
19 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
21 #include "chrome/test/base/in_process_browser_test.h" 20 #include "chrome/test/base/in_process_browser_test.h"
22 #include "chromeos/chromeos_switches.h" 21 #include "chromeos/chromeos_switches.h"
22 #include "components/prefs/pref_service.h"
23 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "content/public/test/test_utils.h" 24 #include "content/public/test/test_utils.h"
25 #include "google_apis/gaia/fake_gaia.h" 25 #include "google_apis/gaia/fake_gaia.h"
26 #include "google_apis/gaia/gaia_switches.h" 26 #include "google_apis/gaia/gaia_switches.h"
27 #include "google_apis/gaia/gaia_urls.h" 27 #include "google_apis/gaia/gaia_urls.h"
28 #include "net/test/embedded_test_server/embedded_test_server.h" 28 #include "net/test/embedded_test_server/embedded_test_server.h"
29 #include "net/test/embedded_test_server/http_response.h" 29 #include "net/test/embedded_test_server/http_response.h"
30 30
31 #if defined(ENABLE_RLZ) 31 #if defined(ENABLE_RLZ)
32 #include "components/rlz/rlz_tracker.h" 32 #include "components/rlz/rlz_tracker.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 FROM_HERE, base::Bind(&GetAccessPointRlzInBackgroundThread, 111 FROM_HERE, base::Bind(&GetAccessPointRlzInBackgroundThread,
112 rlz::RLZTracker::ChromeHomePage(), &rlz_string), 112 rlz::RLZTracker::ChromeHomePage(), &rlz_string),
113 loop.QuitClosure()); 113 loop.QuitClosure());
114 loop.Run(); 114 loop.Run();
115 EXPECT_EQ(base::string16(), rlz_string); 115 EXPECT_EQ(base::string16(), rlz_string);
116 } 116 }
117 } 117 }
118 #endif 118 #endif
119 119
120 } // namespace chromeos 120 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698