more changes

chrome/browser/media/media_internals_unittest.cc

 // 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.
 
 #include "chrome/browser/media/media_internals.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/media/media_internals_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 23 matching lines @@
   }
 
  protected:
   virtual void SetUp() {
     internals_.reset(new MediaInternals());
   }
   scoped_ptr<MediaInternals> internals_;
 };
 
 TEST_F(MediaInternalsTest, UpdateAddsNewItem) {
-  UpdateItem("some.item", "testing", Value::CreateBooleanValue(true));
+  UpdateItem("some.item", "testing", base::TrueValue());
   bool testing = false;
   std::string id;
 
   EXPECT_TRUE(data()->GetBoolean("some.item.testing", &testing));
   EXPECT_TRUE(testing);
 
   EXPECT_TRUE(data()->GetString("some.item.id", &id));
   EXPECT_EQ(id, "some.item");
 }
 
 TEST_F(MediaInternalsTest, UpdateModifiesExistingItem) {
-  UpdateItem("some.item", "testing", Value::CreateBooleanValue(true));
-  UpdateItem("some.item", "value", Value::CreateIntegerValue(5));
-  UpdateItem("some.item", "testing", Value::CreateBooleanValue(false));
+  UpdateItem("some.item", "testing", base::TrueValue());
+  UpdateItem("some.item", "value", base::NumberValue::New(5));
+  UpdateItem("some.item", "testing", base::FalseValue());
   bool testing = true;
   int value = 0;
   std::string id;
 
   EXPECT_TRUE(data()->GetBoolean("some.item.testing", &testing));
   EXPECT_FALSE(testing);
 
   EXPECT_TRUE(data()->GetInteger("some.item.value", &value));
   EXPECT_EQ(value, 5);
 
@@ skipping 18 matching lines @@
   EXPECT_CALL(*observer.get(), OnUpdate(testing::_)).Times(0);
 
   internals_->AddObserver(observer.get());
   internals_->RemoveObserver(observer.get());
   SendUpdate("fn", data());
 }
 
 TEST_F(MediaInternalsTest, DeleteRemovesItem) {
   Value* out;
 
-  UpdateItem("some.item", "testing", Value::CreateNullValue());
+  UpdateItem("some.item", "testing", base::NullValue());
   EXPECT_TRUE(data()->Get("some.item", &out));
   EXPECT_TRUE(data()->Get("some", &out));
 
   DeleteItem("some.item");
   EXPECT_FALSE(data()->Get("some.item", &out));
   EXPECT_TRUE(data()->Get("some", &out));
 
   DeleteItem("some");
   EXPECT_FALSE(data()->Get("some.item", &out));
   EXPECT_FALSE(data()->Get("some", &out));
 }