Use non-static set_key interface on DataReductionProxySettings

components/data_reduction_proxy/browser/data_reduction_proxy_settings_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/data_reduction_proxy/browser/data_reduction_proxy_settings.h"
 
 #include "base/command_line.h"
 #include "base/md5.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 23 matching lines @@
 
 class DataReductionProxySettingsTest
     : public ConcreteDataReductionProxySettingsTest<
           DataReductionProxySettings> {
 };
 
 
 TEST_F(DataReductionProxySettingsTest, TestAuthenticationInit) {
   AddProxyToCommandLine();
   net::HttpAuthCache cache;
-  DataReductionProxySettings::InitDataReductionAuthentication(&cache);
+  DataReductionProxySettings::InitDataReductionAuthentication(
+      &cache, kDataReductionProxyKey);
   DataReductionProxySettings::DataReductionProxyList proxies =
       DataReductionProxySettings::GetDataReductionProxies();
   for (DataReductionProxySettings::DataReductionProxyList::iterator it =
            proxies.begin();  it != proxies.end(); ++it) {
     net::HttpAuthCache::Entry* entry = cache.LookupByPath(*it,
                                                           std::string("/"));
     EXPECT_TRUE(entry != NULL);
     EXPECT_EQ(net::HttpAuth::AUTH_SCHEME_SPDYPROXY, entry->scheme());
     EXPECT_EQ("SpdyProxy", entry->auth_challenge().substr(0,9));
   }
@@ skipping 58 matching lines @@
   EXPECT_EQ("bar.com", proxies[1].host());
   EXPECT_EQ(80, proxies[1].EffectiveIntPort());
 }
 
 TEST_F(DataReductionProxySettingsTest, TestAuthHashGeneration) {
   AddProxyToCommandLine();
   std::string salt = "8675309";  // Jenny's number to test the hash generator.
   std::string salted_key = salt + kDataReductionProxyKey + salt;
   base::string16 expected_hash = base::UTF8ToUTF16(base::MD5String(salted_key));
   EXPECT_EQ(expected_hash,
-            DataReductionProxySettings::AuthHashForSalt(8675309));
+            DataReductionProxySettings::AuthHashForSalt(
+                8675309, kDataReductionProxyKey));
 }
 
 // Test that the auth key set by preprocessor directive is not used
 // when an origin is set via a switch. This test only does anything useful in
 // Chrome builds.
 TEST_F(DataReductionProxySettingsTest,
        TestAuthHashGenerationWithOriginSetViaSwitch) {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kDataReductionProxy, kDataReductionProxy);
   EXPECT_EQ(base::string16(),
-            DataReductionProxySettings::AuthHashForSalt(8675309));
+            DataReductionProxySettings::AuthHashForSalt(
+                8675309, kDataReductionProxyKey));
 }
 
 TEST_F(DataReductionProxySettingsTest, TestIsProxyEnabledOrManaged) {
   AddProxyToCommandLine();
   settings_->InitPrefMembers();
     base::MessageLoopForUI loop;
     // The proxy is disabled initially.
     settings_->enabled_by_user_ = false;
     settings_->SetProxyConfigs(false, false, false);
 
@@ skipping 55 matching lines @@
     {"spdyproxy", true},         // 2. no salt.
     {"SpdyProxyxxx", true},      // 3. Salt not an int.
     {"SpdyProxy1234567", false}, // 4. OK
   };
 
   for (int i = 0; i <= 4; ++i) {
     scoped_refptr<net::AuthChallengeInfo> auth_info(new net::AuthChallengeInfo);
     auth_info->challenger =
         net::HostPortPair::FromString(kDataReductionProxy);
     auth_info->realm = tests[i].realm;
-    base::string16 token =
-        DataReductionProxySettings::GetTokenForAuthChallenge(auth_info.get());
+    base::string16 token = settings_->GetTokenForAuthChallenge(auth_info.get());
     EXPECT_EQ(tests[i].expected_empty_token, token.empty());
   }
 }
 
 TEST_F(DataReductionProxySettingsTest, TestResetDataReductionStatistics) {
   int64 original_content_length;
   int64 received_content_length;
   int64 last_update_time;
   settings_->ResetDataReductionStatistics();
   settings_->GetContentLengths(kNumDaysInHistory,
@@ skipping 171 matching lines @@
   scoped_refptr<net::TestURLRequestContextGetter> request_context =
       new net::TestURLRequestContextGetter(base::MessageLoopProxy::current());
   settings_->InitDataReductionProxySettings(&pref_service_,
                                             &pref_service_,
                                             request_context.get());
 
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace data_reduction_proxy