Split out policy code from net/tools/testserver.

chrome/browser/policy/cloud_policy_browsertest.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 "base/base_paths.h"

[Joao da Silva, 2013/02/12 19:06:05]

remove

[Mattias Nissler (ping if slow), 2013/02/13 11:54:10]

Done.

 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"

[Joao da Silva, 2013/02/12 19:06:05]

remove

[Mattias Nissler (ping if slow), 2013/02/13 11:54:10]

Done.

 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service.h"
 #include "chrome/browser/policy/proto/chrome_settings.pb.h"
 #include "chrome/browser/policy/proto/cloud_policy.pb.h"
+#include "chrome/browser/policy/test/local_policy_test_server.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "googleurl/src/gurl.h"
-#include "net/test/test_server.h"
 #include "policy/policy_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/policy/user_cloud_policy_manager_chromeos.h"
 #else
 #include "chrome/browser/policy/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
@@ skipping 67 matching lines @@
 
 }  // namespace
 
 // Tests the cloud policy stack(s).
 class CloudPolicyTest : public InProcessBrowserTest {
  protected:
   CloudPolicyTest() {}
   virtual ~CloudPolicyTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    // The TestServer wants the docroot as a path relative to the source dir.
-    base::FilePath source;
-    ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &source));
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDirUnderPath(source));
+    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_NO_FATAL_FAILURE(SetServerPolicy(GetEmptyPolicy()));
 
-    test_server_.reset(
-        new net::TestServer(
-            net::TestServer::TYPE_HTTP,
-            net::TestServer::kLocalhost,
-            temp_dir_.path().BaseName()));
+    test_server_.reset(new LocalPolicyTestServer(policy_file_path()));
     ASSERT_TRUE(test_server_->Start());
 
     std::string url = test_server_->GetURL("device_management").spec();

[Joao da Silva, 2013/02/12 19:06:05]

GetServiceURL()?

[Mattias Nissler (ping if slow), 2013/02/13 11:54:10]

Done.

 
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, url);
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     // Checks that no policies have been loaded by the other providers before
     // setting up the cloud connection. Other policies configured in the test
     // machine will interfere with these tests.
     const PolicyMap& map = g_browser_process->policy_service()->GetPolicies(
@@ skipping 40 matching lines @@
 
     // Give a bogus OAuth token to the |policy_manager|. This should make its
     // CloudPolicyClient fetch the DMToken.
     policy_manager->RegisterClient("bogus");
     run_loop.Run();
     Mock::VerifyAndClearExpectations(&observer);
     policy_manager->core()->client()->RemoveObserver(&observer);
   }
 
   void SetServerPolicy(const std::string& policy) {
-    int result = file_util::WriteFile(
-        temp_dir_.path().AppendASCII("device_management"),
-        policy.data(), policy.size());
+    int result = file_util::WriteFile(policy_file_path(), policy.data(),
+                                      policy.size());
     ASSERT_EQ(static_cast<int>(policy.size()), result);
   }
 
+  FilePath policy_file_path() const {
+    return temp_dir_.path().AppendASCII("policy.json");
+  }
+
   base::ScopedTempDir temp_dir_;
   scoped_ptr<net::TestServer> test_server_;
 };
 
 IN_PROC_BROWSER_TEST_F(CloudPolicyTest, FetchPolicy) {
   PolicyService* policy_service = browser()->profile()->GetPolicyService();
   {
     base::RunLoop run_loop;
     policy_service->RefreshPolicies(run_loop.QuitClosure());
     run_loop.Run();
@@ skipping 70 matching lines @@
 
   // They should now serialize to the same bytes.
   std::string chrome_settings_serialized;
   std::string cloud_policy_serialized;
   ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
   ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
   EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
 }
 
 }  // namespace policy