2 files changed, 10 insertions, 10 deletions

diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc
index ebfd6aa..0140142 100644
--- a/chrome/browser/ui/tabs/pinned_tab_codec.cc
+++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc
@@ -39,20 +39,20 @@ static bool HasPinnedTabs(Browser* browser) {
 }
 
 // Adds a DictionaryValue to |values| representing |tab|.
-static void EncodeTab(const StartupTab& tab, ListValue* values) {
-  scoped_ptr<DictionaryValue> value(new DictionaryValue);
+static void EncodeTab(const StartupTab& tab, base::ListValue* values) {
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue);
   value->SetString(kURL, tab.url.spec());
   if (tab.is_app)
     value->SetString(kAppID, tab.app_id);
   values->Append(value.release());
 }
 
-// Adds a DictionaryValue to |values| representing the pinned tab at the
+// Adds a base::DictionaryValue to |values| representing the pinned tab at the
 // specified index.
 static void EncodePinnedTab(TabStripModel* model,
                             int index,
-                            ListValue* values) {
-  scoped_ptr<DictionaryValue> value(new DictionaryValue());
+                            base::ListValue* values) {
+  scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
 
   content::WebContents* web_contents = model->GetWebContentsAt(index);
   if (model->IsAppTab(index)) {
@@ -78,7 +78,7 @@ static void EncodePinnedTab(TabStripModel* model,
 }
 
 // Invokes EncodePinnedTab for each pinned tab in browser.
-static void EncodePinnedTabs(Browser* browser, ListValue* values) {
+static void EncodePinnedTabs(Browser* browser, base::ListValue* values) {
   TabStripModel* tab_model = browser->tab_strip_model();
   for (int i = 0; i < tab_model->count() && tab_model->IsTabPinned(i); ++i)
     EncodePinnedTab(tab_model, i, values);
@@ -86,7 +86,7 @@ static void EncodePinnedTabs(Browser* browser, ListValue* values) {
 
 // Decodes the previously written values in |value| to |tab|, returning true
 // on success.
-static bool DecodeTab(const DictionaryValue& value, StartupTab* tab) {
+static bool DecodeTab(const base::DictionaryValue& value, StartupTab* tab) {
   tab->is_app = false;
 
   std::string url_string;
@@ -113,7 +113,7 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile) {
   if (!prefs)
     return;
 
-  ListValue values;
+  base::ListValue values;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     Browser* browser = *it;
     if (browser->is_type_tabbed() &&
@@ -132,7 +132,7 @@ void PinnedTabCodec::WritePinnedTabs(Profile* profile,
     return;
 
   ListPrefUpdate update(prefs, prefs::kPinnedTabs);
-  ListValue* values = update.Get();
+  base::ListValue* values = update.Get();
   values->Clear();
   for (StartupTabs::const_iterator i = tabs.begin(); i != tabs.end(); ++i)
     EncodeTab(*i, values);
diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
index fd2481a..0e520a0 100644
--- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc
@@ -1783,7 +1783,7 @@ TEST_F(TabStripModelTest, Apps) {
   base::FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
 
-  DictionaryValue manifest;
+  base::DictionaryValue manifest;
   manifest.SetString("name", "hi!");
   manifest.SetString("version", "1");
   manifest.SetString("app.launch.web_url", "http://www.google.com");