Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

shell/context.cc

 // Copyright 2013 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 "shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 132 matching lines @@
 
 #if defined(OS_ANDROID)
   // TODO(eseidel): On Android we pass command line arguments is via the
   // 'parameters' key on the intent, which we specify during 'am shell start'
   // via --esa, however that expects comma-separated values and says:
   //   am shell --help:
   //     [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]
   //     (to embed a comma into a string escape it using "\,")
   // Whatever takes 'parameters' and constructs a CommandLine is failing to
   // un-escape the commas, we need to move this fix to that file.
-  ReplaceSubstringsAfterOffset(&handlers_spec, 0, "\\,", ",");
+  base::ReplaceSubstringsAfterOffset(&handlers_spec, 0, "\\,", ",");
 #endif
 
   std::vector<std::string> parts;
   base::SplitString(handlers_spec, ',', &parts);
   if (parts.size() % 2 != 0) {
     LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                << ": must be a comma-separated list of mimetype/url pairs."
                << " Value was: " << handlers_spec;
     return;
   }
@@ skipping 125 matching lines @@
   TRACE_EVENT0("mojo_shell", "Context::InitWithPaths");
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   if (command_line.HasSwitch(switches::kWaitForDebugger))
     base::debug::WaitForDebugger(60, true);
 
   mojo_shell_child_path_ = shell_child_path;
 
   task_runners_.reset(
-      new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
+      new TaskRunners(base::MessageLoop::current()->task_runner()));
 
 #if !defined(OS_MACOSX)
   application_manager()->SetLoaderForURL(
       make_scoped_ptr(new BackgroundApplicationLoader(
           make_scoped_ptr(
               new URLResponseDiskCacheLoader(task_runners_->blocking_pool(),
                                              url_response_disk_cache_delegate)),
           "url_response_disk_cache", base::MessageLoop::TYPE_DEFAULT)),
       GURL("mojo:url_response_disk_cache"));
 #endif
@@ skipping 89 matching lines @@
   if (app_urls_.find(url) != app_urls_.end()) {
     app_urls_.erase(url);
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK(task_runners_->shell_runner()->RunsTasksOnCurrentThread());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace shell