Move base/values.h into the base namespace.

chrome/browser/sync/sessions/session_state.h

 // Copyright (c) 2011 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.
 
 // The 'sessions' namespace comprises all the pieces of state that are
 // combined to form a SyncSession instance. In that way, it can be thought of
 // as an extension of the SyncSession type itself. Session scoping gives
 // context to things like "conflict progress", "update progress", etc, and the
 // separation this file provides allows clients to only include the parts they
 // need rather than the entire session stack.
 
 #ifndef CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_
 #define CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/sessions/ordered_commit_set.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/syncable/model_type_payload_map.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 
+namespace base {
 class DictionaryValue;
+}
 
 namespace syncable {
 class DirectoryManager;
 }
 
 namespace browser_sync {
 namespace sessions {
 
 class UpdateProgress;
 
 // A container for the source of a sync session. This includes the update
 // source, the datatypes triggering the sync session, and possible session
 // specific payloads which should be sent to the server.
 struct SyncSourceInfo {
   SyncSourceInfo();
   explicit SyncSourceInfo(const syncable::ModelTypePayloadMap& t);
   SyncSourceInfo(
       const sync_pb::GetUpdatesCallerInfo::GetUpdatesSource& u,
       const syncable::ModelTypePayloadMap& t);
   ~SyncSourceInfo();
 
   // Caller takes ownership of the returned dictionary.
-  DictionaryValue* ToValue() const;
+  base::DictionaryValue* ToValue() const;
 
   sync_pb::GetUpdatesCallerInfo::GetUpdatesSource updates_source;
   syncable::ModelTypePayloadMap types;
 };
 
 // Data pertaining to the status of an active Syncer object.
 struct SyncerStatus {
   SyncerStatus();
   ~SyncerStatus();
 
   // Caller takes ownership of the returned dictionary.
-  DictionaryValue* ToValue() const;
+  base::DictionaryValue* ToValue() const;
 
   // True when we get such an INVALID_STORE error from the server.
   bool invalid_store;
   // True iff we're stuck.
   bool syncer_stuck;
   bool syncing;
   int num_successful_commits;
   // This is needed for monitoring extensions activity.
   int num_successful_bookmark_commits;
 
   // Download event counters.
   int num_updates_downloaded_total;
   int num_tombstone_updates_downloaded_total;
 
   // If the syncer encountered a MIGRATION_DONE code, these are the types that
   // the client must now "migrate", by purging and re-downloading all updates.
   syncable::ModelTypeSet types_needing_local_migration;
 
   // Overwrites due to conflict resolution counters.
   int num_local_overwrites;
   int num_server_overwrites;
 };
 
 // Counters for various errors that can occur repeatedly during a sync session.
 struct ErrorCounters {
   ErrorCounters();
 
   // Caller takes ownership of the returned dictionary.
-  DictionaryValue* ToValue() const;
+  base::DictionaryValue* ToValue() const;
 
   int num_conflicting_commits;
 
   // Number of commits hitting transient errors since the last successful
   // commit.
   int consecutive_transient_error_commits;
 
   // Incremented when get_updates fails, commit fails, and when hitting
   // transient errors. When any of these succeed, this counter is reset.
   // TODO(chron): Reduce number of weird counters we use.
   int consecutive_errors;
 };
 
 // Caller takes ownership of the returned dictionary.
-DictionaryValue* DownloadProgressMarkersToValue(
+base::DictionaryValue* DownloadProgressMarkersToValue(
     const std::string
         (&download_progress_markers)[syncable::MODEL_TYPE_COUNT]);
 
 // An immutable snapshot of state from a SyncSession.  Convenient to use as
 // part of notifications as it is inherently thread-safe.
 struct SyncSessionSnapshot {
   SyncSessionSnapshot(
       const SyncerStatus& syncer_status,
       const ErrorCounters& errors,
       int64 num_server_changes_remaining,
       bool is_share_usable,
       const syncable::ModelTypeBitSet& initial_sync_ended,
       const std::string
           (&download_progress_markers)[syncable::MODEL_TYPE_COUNT],
       bool more_to_sync,
       bool is_silenced,
       int64 unsynced_count,
       int num_blocking_conflicting_updates,
       int num_conflicting_updates,
       bool did_commit_items,
       const SyncSourceInfo& source,
       size_t num_entries);
   ~SyncSessionSnapshot();
 
   // Caller takes ownership of the returned dictionary.
-  DictionaryValue* ToValue() const;
+  base::DictionaryValue* ToValue() const;
 
   std::string ToString() const;
 
   const SyncerStatus syncer_status;
   const ErrorCounters errors;
   const int64 num_server_changes_remaining;
   const bool is_share_usable;
   const syncable::ModelTypeBitSet initial_sync_ended;
   const std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
   const bool has_more_to_sync;
@@ skipping 181 matching lines @@
   ~PerModelSafeGroupState();
 
   UpdateProgress update_progress;
   ConflictProgress conflict_progress;
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_