Fixes package prefixes

Fixes how module names for messages with package prefixes are rendered.

- detected while prototyping with beefcake
- fixed on the internal beefcake fork here
[]

This change replicates that fix for the official code generator.

TODO: add a test; what's normal done to test features like this the proto
codebase? Add another test.proto/golden file?
	Change on 2014/12/11 by temiola <temiola@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=81916292

2 files changed, 4 insertions, 4 deletions

diff --git a/test/cpp/interop/client.cc b/test/cpp/interop/client.cc
index a3668d3522..987200f5c4 100644
--- a/test/cpp/interop/client.cc
+++ b/test/cpp/interop/client.cc
@@ -95,8 +95,8 @@ void DoEmpty(std::shared_ptr<ChannelInterface> channel) {
   gpr_log(GPR_INFO, "Sending an empty rpc...");
   std::unique_ptr<TestService::Stub> stub(TestService::NewStub(channel));
 
-  google::protobuf::Empty request = google::protobuf::Empty::default_instance();
-  google::protobuf::Empty response = google::protobuf::Empty::default_instance();
+  grpc::testing::Empty request = grpc::testing::Empty::default_instance();
+  grpc::testing::Empty response = grpc::testing::Empty::default_instance();
   ClientContext context;
 
   grpc::Status s = stub->EmptyCall(&context, request, &response);
diff --git a/test/cpp/interop/test.proto b/test/cpp/interop/test.proto
index e2886c688a..e9c1381b41 100644
--- a/test/cpp/interop/test.proto
+++ b/test/cpp/interop/test.proto
@@ -2,8 +2,8 @@
 // of unary/streaming requests/responses.
 syntax = "proto2";
 
-import "net/grpc/cpp/test/interop/empty.proto";
-import "net/grpc/cpp/test/interop/messages.proto";
+import "test/cpp/interop/empty.proto";
+import "test/cpp/interop/messages.proto";
 
 package grpc.testing;