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

Unified Diff: chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc

Issue 2339753002: MD Settings: Initialize google_brand code in ResetSettingsHandlerTest. (Closed)
Patch Set: Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc
index 49ea9115e1307d33347d1e10528a96507f8ed7c8..12003b627406e00df1d4630b5f46b53de6f69bea 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler_unittest.cc
@@ -6,6 +6,7 @@
#include "base/macros.h"
#include "base/values.h"
+#include "chrome/browser/google/google_brand.h"
#include "chrome/browser/profile_resetter/profile_resetter.h"
#include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
#include "chrome/test/base/testing_profile.h"
@@ -70,10 +71,12 @@ private:
class ResetSettingsHandlerTest : public testing::Test {
public:
- ResetSettingsHandlerTest() : handler_(&profile_, &web_ui_) {
+ ResetSettingsHandlerTest() {
+ google_brand::BrandForTesting brand_for_testing("");
+ handler_.reset(new TestingResetSettingsHandler(&profile_, &web_ui_));
}
- TestingResetSettingsHandler* handler() { return &handler_; }
+ TestingResetSettingsHandler* handler() { return handler_.get(); }
content::TestWebUI* web_ui() { return &web_ui_; }
private:
@@ -81,7 +84,7 @@ class ResetSettingsHandlerTest : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
TestingProfile profile_;
content::TestWebUI web_ui_;
- TestingResetSettingsHandler handler_;
+ std::unique_ptr<TestingResetSettingsHandler> handler_;
};
TEST_F(ResetSettingsHandlerTest, HandleResetProfileSettings) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698