Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

This appears to cause build failure.
http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/1908

This reverts commit 8ddc364fd10bcfe1a4332f0f66be4e5db84e39b6.

TBR=rockot,jam

BUG=

Review URL: https://codereview.chromium.org/1157573002

Cr-Commit-Position: refs/heads/master@{#331047}

4 files changed, 10 insertions, 21 deletions

diff --git a/mojo/environment/default_logger_impl.cc b/mojo/environment/default_logger_impl.cc
index 9a32100..575feb3 100644
--- a/mojo/environment/default_logger_impl.cc
+++ b/mojo/environment/default_logger_impl.cc
@@ -33,10 +33,7 @@ MojoLogLevel ChromiumToMojoLogLevel(int chromium_log_level) {
   return static_cast<MojoLogLevel>(chromium_log_level);
 }
 
-void LogMessage(MojoLogLevel log_level,
-                const char* source_file,
-                uint32_t source_line,
-                const char* message) {
+void LogMessage(MojoLogLevel log_level, const char* message) {
   int chromium_log_level = MojoToChromiumLogLevel(log_level);
   int chromium_min_log_level = logging::GetMinLogLevel();
   // "Fatal" errors aren't suppressable.
diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc
index a2bf37d..38519ef 100644
--- a/mojo/runner/shell_apptest.cc
+++ b/mojo/runner/shell_apptest.cc
@@ -91,13 +91,13 @@ class ShellHTTPAppTest : public test::ApplicationTestBase {
                                            local_address.Pass());
 
     http_server_->GetPort([this](uint16_t p) { port_ = p; });
-    EXPECT_TRUE(http_server_.WaitForIncomingResponse());
+    EXPECT_TRUE(http_server_.WaitForIncomingMethodCall());
 
     InterfacePtr<http_server::HttpHandler> http_handler;
     handler_.reset(new GetHandler(GetProxy(&http_handler).Pass(), port_));
     http_server_->SetHandler(".*", http_handler.Pass(),
                              [](bool result) { EXPECT_TRUE(result); });
-    EXPECT_TRUE(http_server_.WaitForIncomingResponse());
+    EXPECT_TRUE(http_server_.WaitForIncomingMethodCall());
   }
 
   std::string GetURL(const std::string& path) {
diff --git a/mojo/services/network/http_server_apptest.cc b/mojo/services/network/http_server_apptest.cc
index 32c249c..9652c05a 100644
--- a/mojo/services/network/http_server_apptest.cc
+++ b/mojo/services/network/http_server_apptest.cc
@@ -567,7 +567,7 @@ class HttpServerAppTest : public test::ApplicationTestBase {
           EXPECT_NE(0u, bound_to->ipv4->port);
           *out_bound_to = bound_to.Pass();
         });
-    network_service_.WaitForIncomingResponse();
+    network_service_.WaitForIncomingMethodCall();
   }
 
   NetworkServicePtr network_service_;
diff --git a/mojo/tools/rev_sdk.py b/mojo/tools/rev_sdk.py
index 06241ee..15812c5 100755
--- a/mojo/tools/rev_sdk.py
+++ b/mojo/tools/rev_sdk.py
@@ -23,7 +23,7 @@ sdk_dirs_to_clone = [
 sdk_dirs_to_not_clone = [
   "mojo/public/cpp/application",
   "mojo/public/interfaces/application",
-  "mojo/public/java/application",
+  "third_party/mojo/src/mojo/public/java/application",
 ]
 
 # Individual files to preserve within the target repository during roll. These
@@ -43,9 +43,8 @@ for sdk_dir in sdk_dirs_to_clone:
   sdk_dir_in_chromium = os.path.join(sdk_prefix_in_chromium, sdk_dir)
   dirs_to_clone[sdk_dir] = sdk_dir_in_chromium
 
-def rev(source_dir, chromium_dir, mojo_revision):
-  src_commit = system(["git", "rev-parse", mojo_revision],
-                      cwd=source_dir).strip()
+def rev(source_dir, chromium_dir):
+  src_commit = system(["git", "show-ref", "HEAD", "-s"], cwd=source_dir).strip()
 
   for input_dir, dest_dir in dirs_to_clone.iteritems():
     if os.path.exists(os.path.join(chromium_dir, dest_dir)):
@@ -90,15 +89,8 @@ def rev(source_dir, chromium_dir, mojo_revision):
 
   commit("Update mojo sdk to rev " + src_commit, cwd=chromium_dir)
 
-if len(sys.argv) < 2:
-  print "usage: rev_sdk.py <mojo source dir> [<mojo revision>]"
+if len(sys.argv) != 2:
+  print "usage: rev_sdk.py <mojo source dir>"
   sys.exit(1)
 
-# Allow override of the roll revision.
-if len(sys.argv) == 3:
-  mojo_revision = sys.argv[2]
-else:
-  mojo_revision = 'origin/HEAD'
-
-rev(sys.argv[1], chromium_root_dir, mojo_revision)
-
+rev(sys.argv[1], chromium_root_dir)