[M54] Merge Linux ChromeOS Buildspec browsertest fix

chrome/browser/policy/test/local_policy_test_server.cc

 // Copyright (c) 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 "chrome/browser/policy/test/local_policy_test_server.h"
 
 #include <ctype.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 179 matching lines @@
                      .AppendASCII("python"));
 
   // Add the generated python protocol buffer bindings.
   base::FilePath pyproto_dir;
   if (!GetPyProtoPath(&pyproto_dir)) {
     LOG(ERROR) << "Cannot find pyproto dir for generated code.";
     return false;
   }
 
   AppendToPythonPath(pyproto_dir
+                     .AppendASCII("components")
                      .AppendASCII("policy")
                      .AppendASCII("proto"));
 #if defined(OS_CHROMEOS)
   AppendToPythonPath(pyproto_dir
                      .AppendASCII("chrome")
                      .AppendASCII("browser")
                      .AppendASCII("chromeos")
                      .AppendASCII("policy")
                      .AppendASCII("proto"));
 #endif
@@ skipping 47 matching lines @@
 std::string LocalPolicyTestServer::GetSelector(const std::string& type,
                                                const std::string& entity_id) {
   std::string selector = type;
   if (!entity_id.empty())
     selector = base::StringPrintf("%s/%s", type.c_str(), entity_id.c_str());
   std::replace_if(selector.begin(), selector.end(), IsUnsafeCharacter, '_');
   return selector;
 }
 
 }  // namespace policy