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

remoting/host/json_host_config_unittest.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 "base/file_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
+#include "base/scoped_temp_dir.h"
 #include "remoting/host/json_host_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
 namespace {
 const char* kTestConfig =
 "{\n"
 "  \"xmpp_login\" : \"test@gmail.com\",\n"
 "  \"xmpp_auth_token\" : \"TEST_AUTH_TOKEN\",\n"
@@ skipping 80 matching lines @@
   EXPECT_EQ(new_auth_token_value, value);
   EXPECT_TRUE(reader->GetString(kHostIdConfigPath, &value));
   EXPECT_EQ("TEST_HOST_ID", value);
   EXPECT_TRUE(reader->GetString(kHostNameConfigPath, &value));
   EXPECT_EQ("TEST_MACHINE_NAME", value);
   EXPECT_TRUE(reader->GetString(kPrivateKeyConfigPath, &value));
   EXPECT_EQ("TEST_PRIVATE_KEY", value);
 }
 
 }