Move scoped_temp_dir and scoped_native_library back from base/memory to base.

chrome/browser/prefs/pref_service_uitest.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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/values.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/common/json_value_serializer.h"
 #include "ui/gfx/rect.h"
 
@@ skipping 175 matching lines @@
   // Find if launched window is maximized.
   bool is_window_maximized = false;
   ASSERT_TRUE(window->IsMaximized(&is_window_maximized));
   bool is_maximized = false;
   EXPECT_TRUE(root_dict->GetBoolean(kBrowserWindowPlacement + ".maximized",
       &is_maximized));
   EXPECT_EQ(is_maximized, is_window_maximized);
 }
 #endif