1 files changed, 10 insertions, 12 deletions
diff --git a/chromium/skia/ext/image_operations_bench.cc b/chromium/skia/ext/image_operations_bench.cc
index 11263f3d788..c4146d260c5 100644
--- a/chromium/skia/ext/image_operations_bench.cc
+++ b/chromium/skia/ext/image_operations_bench.cc
@@ -144,7 +144,7 @@ class Benchmark {
         method_(kDefaultResizeMethod) {}
 
   // Returns true if command line parsing was successful, false otherwise.
-  bool ParseArgs(const CommandLine* command_line);
+  bool ParseArgs(const base::CommandLine* command_line);
 
   // Returns true if successful, false otherwise.
   bool Run() const;
@@ -176,17 +176,17 @@ void Benchmark::Usage() {
   printf("\n  -help: prints this help and exits\n");
 }
 
-bool Benchmark::ParseArgs(const CommandLine* command_line) {
-  const CommandLine::SwitchMap& switches = command_line->GetSwitches();
+bool Benchmark::ParseArgs(const base::CommandLine* command_line) {
+  const base::CommandLine::SwitchMap& switches = command_line->GetSwitches();
   bool fNeedHelp = false;
 
-  for (CommandLine::SwitchMap::const_iterator iter = switches.begin();
+  for (base::CommandLine::SwitchMap::const_iterator iter = switches.begin();
        iter != switches.end();
        ++iter) {
     const std::string& s = iter->first;
     std::string value;
 #if defined(OS_WIN)
-    value = WideToUTF8(iter->second);
+    value = base::WideToUTF8(iter->second);
 #else
     value = iter->second;
 #endif
@@ -229,9 +229,7 @@ bool Benchmark::ParseArgs(const CommandLine* command_line) {
 // actual benchmark.
 bool Benchmark::Run() const {
   SkBitmap source;
-  source.setConfig(SkBitmap::kARGB_8888_Config,
-                   source_.width(), source_.height());
-  source.allocPixels();
+  source.allocN32Pixels(source_.width(), source_.height());
   source.eraseARGB(0, 0, 0, 0);
 
   SkBitmap dest;
@@ -262,14 +260,14 @@ bool Benchmark::Run() const {
 class CommandLineAutoReset {
  public:
   CommandLineAutoReset(int argc, char** argv) {
-    CommandLine::Init(argc, argv);
+    base::CommandLine::Init(argc, argv);
   }
   ~CommandLineAutoReset() {
-    CommandLine::Reset();
+    base::CommandLine::Reset();
   }
 
-  const CommandLine* Get() const {
-    return CommandLine::ForCurrentProcess();
+  const base::CommandLine* Get() const {
+    return base::CommandLine::ForCurrentProcess();
   }
 };