summaryrefslogtreecommitdiffstats
path: root/net/spdy
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 19:15:03 +0000
commitf3a1c64a4d81c412273ed567536f23c2c14813a2 (patch)
treef0ced21805b18546e879413e4f808dd4f683c534 /net/spdy
parent2338319a9acbaecba44243740b3f01b5c408a78a (diff)
downloadchromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.zip
chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.gz
chromium_src-f3a1c64a4d81c412273ed567536f23c2c14813a2.tar.bz2
Move base/values.h into the base namespace. This includes a cros DEPS roll
with a minor change to that code since libcros also uses base/values.h. BUG=88666 TEST=none Review URL: http://codereview.chromium.org/7259019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
-rw-r--r--net/spdy/spdy_session.h4
-rw-r--r--net/spdy/spdy_session_pool.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 5fd3520..58e617b 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -172,7 +172,7 @@ class NET_API SpdySession : public base::RefCounted<SpdySession>,
// Retrieves information on the current state of the SPDY session as a
// Value. Caller takes possession of the returned value.
- Value* GetInfoAsValue() const;
+ base::Value* GetInfoAsValue() const;
// Indicates whether the session is being reused after having successfully
// used to send/receive data in the past.
@@ -452,7 +452,7 @@ class NetLogSpdySynParameter : public NetLog::EventParameters {
return headers_;
}
- virtual Value* ToValue() const;
+ virtual base::Value* ToValue() const;
private:
virtual ~NetLogSpdySynParameter();
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 99319ee..74b8874 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -99,7 +99,7 @@ class NET_API SpdySessionPool
// Creates a Value summary of the state of the spdy session pool. The caller
// responsible for deleting the returned value.
- Value* SpdySessionPoolInfoToValue() const;
+ base::Value* SpdySessionPoolInfoToValue() const;
SpdySettingsStorage* mutable_spdy_settings() { return &spdy_settings_; }
const SpdySettingsStorage& spdy_settings() const { return spdy_settings_; }