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

Side by Side Diff: chrome/browser/ui/webui/local_discovery/local_discovery_ui_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 16 matching lines...) Expand all
27 #include "components/signin/core/browser/profile_oauth2_token_service.h" 27 #include "components/signin/core/browser/profile_oauth2_token_service.h"
28 #include "components/signin/core/browser/signin_manager.h" 28 #include "components/signin/core/browser/signin_manager.h"
29 #include "components/signin/core/browser/signin_manager_base.h" 29 #include "components/signin/core/browser/signin_manager_base.h"
30 #include "google_apis/gaia/gaia_urls.h" 30 #include "google_apis/gaia/gaia_urls.h"
31 #include "net/http/http_status_code.h" 31 #include "net/http/http_status_code.h"
32 #include "net/url_request/test_url_fetcher_factory.h" 32 #include "net/url_request/test_url_fetcher_factory.h"
33 #include "net/url_request/url_request_status.h" 33 #include "net/url_request/url_request_status.h"
34 #include "net/url_request/url_request_test_util.h" 34 #include "net/url_request/url_request_test_util.h"
35 35
36 #if defined(OS_CHROMEOS) 36 #if defined(OS_CHROMEOS)
37 #include "base/prefs/pref_service.h"
38 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
39 #include "chromeos/chromeos_switches.h" 38 #include "chromeos/chromeos_switches.h"
39 #include "components/prefs/pref_service.h"
40 #endif 40 #endif
41 41
42 using testing::InvokeWithoutArgs; 42 using testing::InvokeWithoutArgs;
43 using testing::Return; 43 using testing::Return;
44 using testing::AtLeast; 44 using testing::AtLeast;
45 using testing::DoDefault; 45 using testing::DoDefault;
46 using testing::DoAll; 46 using testing::DoAll;
47 using testing::InSequence; 47 using testing::InSequence;
48 using testing::StrictMock; 48 using testing::StrictMock;
49 using testing::AnyNumber; 49 using testing::AnyNumber;
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 kAnnouncePacketRegistered, sizeof(kAnnouncePacketRegistered)); 574 kAnnouncePacketRegistered, sizeof(kAnnouncePacketRegistered));
575 575
576 base::MessageLoop::current()->RunUntilIdle(); 576 base::MessageLoop::current()->RunUntilIdle();
577 577
578 EXPECT_TRUE(WebUIBrowserTest::RunJavascriptTest("expectRegisterDone")); 578 EXPECT_TRUE(WebUIBrowserTest::RunJavascriptTest("expectRegisterDone"));
579 } 579 }
580 580
581 } // namespace 581 } // namespace
582 582
583 } // namespace local_discovery 583 } // namespace local_discovery
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/instant_ui.cc ('k') | chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698