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

Side by Side Diff: chrome/browser/password_manager/password_manager_browsertest.cc

Issue 951883002: [Password Manager Cleanup] Replaces NULL -> nullptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addresses Vaclav's comments. Created 5 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram_samples.h" 8 #include "base/metrics/histogram_samples.h"
9 #include "base/metrics/statistics_recorder.h" 9 #include "base/metrics/statistics_recorder.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 infobar_is_being_shown_ = true; 183 infobar_is_being_shown_ = true;
184 } 184 }
185 185
186 void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override { 186 void OnInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override {
187 infobar_is_being_shown_ = false; 187 infobar_is_being_shown_ = false;
188 } 188 }
189 189
190 void OnManagerShuttingDown(infobars::InfoBarManager* manager) override { 190 void OnManagerShuttingDown(infobars::InfoBarManager* manager) override {
191 ASSERT_EQ(infobar_service_, manager); 191 ASSERT_EQ(infobar_service_, manager);
192 infobar_service_->RemoveObserver(this); 192 infobar_service_->RemoveObserver(this);
193 infobar_service_ = NULL; 193 infobar_service_ = nullptr;
194 } 194 }
195 195
196 bool infobar_is_being_shown_; 196 bool infobar_is_being_shown_;
197 InfoBarService* infobar_service_; 197 InfoBarService* infobar_service_;
198 198
199 DISALLOW_COPY_AND_ASSIGN(InfoBarObserver); 199 DISALLOW_COPY_AND_ASSIGN(InfoBarObserver);
200 }; 200 };
201 201
202 class BubbleObserver : public PromptObserver { 202 class BubbleObserver : public PromptObserver {
203 public: 203 public:
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1608 // save it, but the script cannot trigger that just by assigning to the 1608 // save it, but the script cannot trigger that just by assigning to the
1609 // field's value. 1609 // field's value.
1610 std::string fill_and_back = 1610 std::string fill_and_back =
1611 "document.getElementById('password_field').value = 'random';" 1611 "document.getElementById('password_field').value = 'random';"
1612 "document.getElementById('input_submit_button').click();" 1612 "document.getElementById('input_submit_button').click();"
1613 "window.history.back();"; 1613 "window.history.back();";
1614 ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_back)); 1614 ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_back));
1615 observer.Wait(); 1615 observer.Wait();
1616 EXPECT_FALSE(prompt_observer->IsShowingPrompt()); 1616 EXPECT_FALSE(prompt_observer->IsShowingPrompt());
1617 } 1617 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698