Fix the following browser_tests in the Linux GN build.

net/test/python_utils.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 "net/test/python_utils.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/foundation_util.h"
+#endif
+
 const char kPythonPathEnv[] = "PYTHONPATH";
 
 void AppendToPythonPath(const base::FilePath& dir) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string old_path;
   std::string dir_path;
 #if defined(OS_WIN)
   dir_path = base::WideToUTF8(dir.value());
 #elif defined(OS_POSIX)
   dir_path = dir.value();
@@ skipping 13 matching lines @@
 }
 
 bool GetPyProtoPath(base::FilePath* dir) {
   // Locate the Python code generated by the protocol buffers compiler.
   base::FilePath generated_code_dir;
   if (!PathService::Get(base::DIR_EXE, &generated_code_dir)) {
     LOG(ERROR) << "Can't find " << generated_code_dir.value();
     return false;
   }
 
+#if defined(OS_MACOSX)
+  if (base::mac::AmIBundled())
+    generated_code_dir = generated_code_dir.DirName().DirName().DirName();
+#endif
+
+  // Used for GYP. TODO(jam): remove after GN conversion.
   const base::FilePath kPyProto(FILE_PATH_LITERAL("pyproto"));
+  if (base::DirectoryExists(generated_code_dir.Append(kPyProto))) {
+    *dir = generated_code_dir.Append(kPyProto);
+    return true;
+  }
 
-#if defined(OS_MACOSX)
-  // On Mac, DIR_EXE might be pointing deep into the Release/ (or Debug/)
-  // directory and we can't depend on how far down it goes. So we walk upwards
-  // from DIR_EXE until we find a likely looking spot.
-  while (!base::DirectoryExists(generated_code_dir.Append(kPyProto))) {
-    base::FilePath parent = generated_code_dir.DirName();
-    if (parent == generated_code_dir) {
-      // We hit the root directory. Maybe we didn't build any targets which
-      // produced Python protocol buffers.
-      return false;
-    }
-    generated_code_dir = parent;
+  // Used for GN.
+  const base::FilePath kGen(FILE_PATH_LITERAL("gen"));
+  if (base::DirectoryExists(generated_code_dir.Append(kGen))) {
+    *dir = generated_code_dir.Append(kGen);
+    return true;
   }
-#endif
-  *dir = generated_code_dir.Append(kPyProto);
-  VLOG(2) << "Found " << kPyProto.value() << " in " << dir->value();
-  return true;
+
+  return false;
 }
 
 #if defined(OS_WIN)
 struct PythonExePath {
   PythonExePath() {
     // This is test-only code, so CHECK with a subprocess invocation is ok.
     base::CommandLine command(base::FilePath(FILE_PATH_LITERAL("cmd")));
     command.AppendArg("/c");
     command.AppendArg("python");
     command.AppendArg("-c");
@@ skipping 23 matching lines @@
 #else
   python_cmd->SetProgram(base::FilePath(FILE_PATH_LITERAL("python")));
 #endif
 
   // Launch python in unbuffered mode, so that python output doesn't mix with
   // gtest output in buildbot log files. See http://crbug.com/147368.
   python_cmd->AppendArg("-u");
 
   return true;
 }