summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-30 10:32:41 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-30 10:32:41 +0000
commitb54e6259cc91acf5c1f37ae5f7126a47a9447b1f (patch)
tree1c521be12176fc81f84110372ad874548a325e64 /cc
parent63aaa3f95c09df0edfc9a3703ad638cd4644434b (diff)
downloadchromium_src-b54e6259cc91acf5c1f37ae5f7126a47a9447b1f.zip
chromium_src-b54e6259cc91acf5c1f37ae5f7126a47a9447b1f.tar.gz
chromium_src-b54e6259cc91acf5c1f37ae5f7126a47a9447b1f.tar.bz2
Get rid of some uses of base::Create*Value
BUG=160586 TBR=finnur, ajuma, thakis, atwilson Review URL: https://codereview.chromium.org/131503015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/resources/managed_tile_state.cc20
-rw-r--r--cc/resources/raster_mode.cc8
-rw-r--r--cc/resources/tile_priority.cc37
3 files changed, 30 insertions, 35 deletions
diff --git a/cc/resources/managed_tile_state.cc b/cc/resources/managed_tile_state.cc
index 1c66044..198ebb3 100644
--- a/cc/resources/managed_tile_state.cc
+++ b/cc/resources/managed_tile_state.cc
@@ -14,34 +14,34 @@ scoped_ptr<base::Value> ManagedTileBinAsValue(ManagedTileBin bin) {
switch (bin) {
case NOW_AND_READY_TO_DRAW_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("NOW_AND_READY_TO_DRAW_BIN"));
+ new base::StringValue("NOW_AND_READY_TO_DRAW_BIN"));
case NOW_BIN:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue("NOW_BIN"));
+ return scoped_ptr<base::Value>(new base::StringValue("NOW_BIN"));
case SOON_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("SOON_BIN"));
+ new base::StringValue("SOON_BIN"));
case EVENTUALLY_AND_ACTIVE_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("EVENTUALLY_AND_ACTIVE_BIN"));
+ new base::StringValue("EVENTUALLY_AND_ACTIVE_BIN"));
case EVENTUALLY_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("EVENTUALLY_BIN"));
+ new base::StringValue("EVENTUALLY_BIN"));
case AT_LAST_AND_ACTIVE_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("AT_LAST_AND_ACTIVE_BIN"));
+ new base::StringValue("AT_LAST_AND_ACTIVE_BIN"));
case AT_LAST_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("AT_LAST_BIN"));
+ new base::StringValue("AT_LAST_BIN"));
case NEVER_BIN:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("NEVER_BIN"));
+ new base::StringValue("NEVER_BIN"));
case NUM_BINS:
NOTREACHED();
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("Invalid Bin (NUM_BINS)"));
+ new base::StringValue("Invalid Bin (NUM_BINS)"));
}
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("Invalid Bin (UNKNOWN)"));
+ new base::StringValue("Invalid Bin (UNKNOWN)"));
}
ManagedTileState::ManagedTileState()
diff --git a/cc/resources/raster_mode.cc b/cc/resources/raster_mode.cc
index 47d6344..61375c2 100644
--- a/cc/resources/raster_mode.cc
+++ b/cc/resources/raster_mode.cc
@@ -14,17 +14,17 @@ scoped_ptr<base::Value> RasterModeAsValue(RasterMode raster_mode) {
switch (raster_mode) {
case HIGH_QUALITY_NO_LCD_RASTER_MODE:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("HIGH_QUALITY_NO_LCD_RASTER_MODE"));
+ new base::StringValue("HIGH_QUALITY_NO_LCD_RASTER_MODE"));
case HIGH_QUALITY_RASTER_MODE:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("HIGH_QUALITY_RASTER_MODE"));
+ new base::StringValue("HIGH_QUALITY_RASTER_MODE"));
case LOW_QUALITY_RASTER_MODE:
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("LOW_QUALITY_RASTER_MODE"));
+ new base::StringValue("LOW_QUALITY_RASTER_MODE"));
default:
NOTREACHED() << "Unrecognized RasterMode value " << raster_mode;
return scoped_ptr<base::Value>(
- base::Value::CreateStringValue("<unknown RasterMode value>"));
+ new base::StringValue("<unknown RasterMode value>"));
}
}
diff --git a/cc/resources/tile_priority.cc b/cc/resources/tile_priority.cc
index 1523eef..672a2f0 100644
--- a/cc/resources/tile_priority.cc
+++ b/cc/resources/tile_priority.cc
@@ -55,14 +55,12 @@ namespace cc {
scoped_ptr<base::Value> WhichTreeAsValue(WhichTree tree) {
switch (tree) {
case ACTIVE_TREE:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
- "ACTIVE_TREE"));
+ return scoped_ptr<base::Value>(new base::StringValue("ACTIVE_TREE"));
case PENDING_TREE:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
- "PENDING_TREE"));
+ return scoped_ptr<base::Value>(new base::StringValue("PENDING_TREE"));
default:
DCHECK(false) << "Unrecognized WhichTree value " << tree;
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"<unknown WhichTree value>"));
}
}
@@ -71,17 +69,15 @@ scoped_ptr<base::Value> TileResolutionAsValue(
TileResolution resolution) {
switch (resolution) {
case LOW_RESOLUTION:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
- "LOW_RESOLUTION"));
+ return scoped_ptr<base::Value>(new base::StringValue("LOW_RESOLUTION"));
case HIGH_RESOLUTION:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
- "HIGH_RESOLUTION"));
+ return scoped_ptr<base::Value>(new base::StringValue("HIGH_RESOLUTION"));
case NON_IDEAL_RESOLUTION:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"NON_IDEAL_RESOLUTION"));
}
DCHECK(false) << "Unrecognized TileResolution value " << resolution;
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"<unknown TileResolution value>"));
}
@@ -138,20 +134,19 @@ scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
TileMemoryLimitPolicy policy) {
switch (policy) {
case ALLOW_NOTHING:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
- "ALLOW_NOTHING"));
+ return scoped_ptr<base::Value>(new base::StringValue("ALLOW_NOTHING"));
case ALLOW_ABSOLUTE_MINIMUM:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"ALLOW_ABSOLUTE_MINIMUM"));
case ALLOW_PREPAINT_ONLY:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"ALLOW_PREPAINT_ONLY"));
case ALLOW_ANYTHING:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"ALLOW_ANYTHING"));
default:
DCHECK(false) << "Unrecognized policy value";
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"<unknown>"));
}
}
@@ -159,17 +154,17 @@ scoped_ptr<base::Value> TileMemoryLimitPolicyAsValue(
scoped_ptr<base::Value> TreePriorityAsValue(TreePriority prio) {
switch (prio) {
case SAME_PRIORITY_FOR_BOTH_TREES:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"SAME_PRIORITY_FOR_BOTH_TREES"));
case SMOOTHNESS_TAKES_PRIORITY:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"SMOOTHNESS_TAKES_PRIORITY"));
case NEW_CONTENT_TAKES_PRIORITY:
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"NEW_CONTENT_TAKES_PRIORITY"));
}
DCHECK(false) << "Unrecognized priority value " << prio;
- return scoped_ptr<base::Value>(base::Value::CreateStringValue(
+ return scoped_ptr<base::Value>(new base::StringValue(
"<unknown>"));
}