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

Unified Diff: chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc

Issue 2419733005: Extract a base class from CommandLinePrefStore (Closed)
Patch Set: nit in comment Created 4 years, 2 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
Index: chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc
diff --git a/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc b/chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc
similarity index 93%
rename from chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc
rename to chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc
index 4b2fef741873875ebae2ed43a70654e542751d69..a9c464930c02be58db31d8578ef2d781e07f14f3 100644
--- a/chrome/browser/prefs/command_line_pref_store_proxy_unittest.cc
+++ b/chrome/browser/prefs/chrome_command_line_pref_store_proxy_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/prefs/command_line_pref_store.h"
+#include "chrome/browser/prefs/chrome_command_line_pref_store.h"
#include <gtest/gtest.h>
#include <stddef.h>
@@ -10,7 +10,6 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "chrome/browser/prefs/command_line_pref_store.h"
#include "chrome/common/chrome_switches.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
@@ -153,10 +152,10 @@ static const CommandLineTestParams kCommandLineTestParams[] = {
} // namespace
-class CommandLinePrefStoreProxyTest
+class ChromeCommandLinePrefStoreProxyTest
: public testing::TestWithParam<CommandLineTestParams> {
protected:
- CommandLinePrefStoreProxyTest()
+ ChromeCommandLinePrefStoreProxyTest()
: command_line_(base::CommandLine::NO_PROGRAM) {}
net::ProxyConfig* proxy_config() { return &proxy_config_; }
@@ -173,7 +172,8 @@ class CommandLinePrefStoreProxyTest
scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple;
PrefProxyConfigTrackerImpl::RegisterPrefs(registry.get());
syncable_prefs::PrefServiceMockFactory factory;
- factory.set_command_line_prefs(new CommandLinePrefStore(&command_line_));
+ factory.set_command_line_prefs(
+ new ChromeCommandLinePrefStore(&command_line_));
pref_service_ = factory.Create(registry.get());
PrefProxyConfigTrackerImpl::ReadPrefConfig(pref_service_.get(),
&proxy_config_);
@@ -185,12 +185,12 @@ class CommandLinePrefStoreProxyTest
net::ProxyConfig proxy_config_;
};
-TEST_P(CommandLinePrefStoreProxyTest, CommandLine) {
+TEST_P(ChromeCommandLinePrefStoreProxyTest, CommandLine) {
EXPECT_EQ(GetParam().auto_detect, proxy_config()->auto_detect());
EXPECT_EQ(GetParam().pac_url, proxy_config()->pac_url());
EXPECT_TRUE(GetParam().proxy_rules.Matches(proxy_config()->proxy_rules()));
}
-INSTANTIATE_TEST_CASE_P(CommandLinePrefStoreProxyTestInstance,
- CommandLinePrefStoreProxyTest,
+INSTANTIATE_TEST_CASE_P(ChromeCommandLinePrefStoreProxyTestInstance,
+ ChromeCommandLinePrefStoreProxyTest,
testing::ValuesIn(kCommandLineTestParams));

Powered by Google App Engine
This is Rietveld 408576698