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

Side by Side Diff: chrome/test/base/ui_test_utils.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 "chrome/test/base/ui_test_utils.h" 5 #include "chrome/test/base/ui_test_utils.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 namespace ui_test_utils { 90 namespace ui_test_utils {
91 91
92 namespace { 92 namespace {
93 93
94 Browser* WaitForBrowserNotInSet(std::set<Browser*> excluded_browsers) { 94 Browser* WaitForBrowserNotInSet(std::set<Browser*> excluded_browsers) {
95 Browser* new_browser = GetBrowserNotInSet(excluded_browsers); 95 Browser* new_browser = GetBrowserNotInSet(excluded_browsers);
96 if (new_browser == NULL) { 96 if (new_browser == NULL) {
97 BrowserAddedObserver observer; 97 BrowserAddedObserver observer;
98 new_browser = observer.WaitForSingleNewBrowser(); 98 new_browser = observer.WaitForSingleNewBrowser();
99 // The new browser should never be in |excluded_browsers|. 99 // The new browser should never be in |excluded_browsers|.
100 DCHECK(!ContainsKey(excluded_browsers, new_browser)); 100 DCHECK(!base::ContainsKey(excluded_browsers, new_browser));
101 } 101 }
102 return new_browser; 102 return new_browser;
103 } 103 }
104 104
105 class AppModalDialogWaiter : public app_modal::AppModalDialogObserver { 105 class AppModalDialogWaiter : public app_modal::AppModalDialogObserver {
106 public: 106 public:
107 AppModalDialogWaiter() 107 AppModalDialogWaiter()
108 : dialog_(NULL) { 108 : dialog_(NULL) {
109 } 109 }
110 ~AppModalDialogWaiter() override { 110 ~AppModalDialogWaiter() override {
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 new content::MessageLoopRunner; 536 new content::MessageLoopRunner;
537 WaitHistoryLoadedObserver observer(runner.get()); 537 WaitHistoryLoadedObserver observer(runner.get());
538 ScopedObserver<history::HistoryService, history::HistoryServiceObserver> 538 ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
539 scoped_observer(&observer); 539 scoped_observer(&observer);
540 scoped_observer.Add(history_service); 540 scoped_observer.Add(history_service);
541 runner->Run(); 541 runner->Run();
542 } 542 }
543 } 543 }
544 544
545 } // namespace ui_test_utils 545 } // namespace ui_test_utils
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_process_util.cc ('k') | chrome/test/chromedriver/chrome/device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698