Revert of Stop passing raw pointers to base::Value API in c/b/ui

chrome/browser/ui/browser_window_state.cc

 // Copyright (c) 2012 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/ui/browser_window_state.h"
 
 #include <stddef.h>
 
-#include <utility>
-
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
@@ skipping 30 matching lines @@
  public:
   WindowPlacementPrefUpdate(PrefService* service,
                             const std::string& window_name)
       : DictionaryPrefUpdate(service, prefs::kAppWindowPlacement),
         window_name_(window_name) {}
 
   ~WindowPlacementPrefUpdate() override {}
 
   base::DictionaryValue* Get() override {
     base::DictionaryValue* all_apps_dict = DictionaryPrefUpdate::Get();
-    base::DictionaryValue* this_app_dict_weak = NULL;
-    if (!all_apps_dict->GetDictionary(window_name_, &this_app_dict_weak)) {
-      auto this_app_dict = base::MakeUnique<base::DictionaryValue>();
-      this_app_dict_weak = this_app_dict.get();
-      all_apps_dict->Set(window_name_, std::move(this_app_dict));
+    base::DictionaryValue* this_app_dict = NULL;
+    if (!all_apps_dict->GetDictionary(window_name_, &this_app_dict)) {
+      this_app_dict = new base::DictionaryValue;
+      all_apps_dict->Set(window_name_, this_app_dict);
     }
-    return this_app_dict_weak;
+    return this_app_dict;
   }
 
  private:
   const std::string window_name_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPlacementPrefUpdate);
 };
 
 }  // namespace
 
@@ skipping 93 matching lines @@
   if (parsed_command_line.HasSwitch(switches::kWindowPosition)) {
     std::string str =
         parsed_command_line.GetSwitchValueASCII(switches::kWindowPosition);
     int x, y;
     if (ParseCommaSeparatedIntegers(str, &x, &y))
       bounds->set_origin(gfx::Point(x, y));
   }
 }
 
 }  // namespace chrome