Move plugin/srpc contents to the more appropriately named plugin/common....

Move plugin/srpc contents to the plugin top directory.
Clean up the resulting header file paths and guards, and remove some
superfluous inclusions found along the way.


Committed: http://code.google.com/p/nativeclient/source/detail?r=2732

[sehr (please use chromium), 2010-07-15 00:23:21]

Very simple stuff, but lots of files...

Thanks in advance.

David

[polina, 2010-07-15 07:59:25]

I think "base" would have been a better name than "common". It should not be too
hard to rename since the includes will still be in an alphabetical order. You
can just do a global search-and-replace. So please consider it although I don't
insist. Thanks!

http://codereview.chromium.org/2981011/diff/1/4
File src/trusted/plugin/common/browser_interface.cc (right):

http://codereview.chromium.org/2981011/diff/1/4#newcode10
src/trusted/plugin/common/browser_interface.cc:10: #include
"native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
it's odd that our generic interface includes npapi stuff...

http://codereview.chromium.org/2981011/diff/1/50
File src/trusted/plugin/plugin.gyp (right):

http://codereview.chromium.org/2981011/diff/1/50#newcode180
src/trusted/plugin/plugin.gyp:180: 'npapi/video_chrome.cc',
npapi? not common?

[sehr (please use chromium), 2010-07-15 21:04:25]

I'm going to move this to plugin/ rather than either subdirectory.

http://codereview.chromium.org/2981011/diff/1/4
File src/trusted/plugin/common/browser_interface.cc (right):

http://codereview.chromium.org/2981011/diff/1/4#newcode10
src/trusted/plugin/common/browser_interface.cc:10: #include
"native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
On 2010/07/15 07:59:26, polina wrote:
> it's odd that our generic interface includes npapi stuff...

Good catch.  I missed that in the last CL.  Fixed.

http://codereview.chromium.org/2981011/diff/1/50
File src/trusted/plugin/plugin.gyp (right):

http://codereview.chromium.org/2981011/diff/1/50#newcode180
src/trusted/plugin/plugin.gyp:180: 'npapi/video_chrome.cc',
On 2010/07/15 07:59:26, polina wrote:
> npapi? not common?

This is the legacy 2D video, which is really only supported in Firefox.  The
video_chrome.cc file contains stubs for the api, which is a result of bad
factoring.  We should come back to clean up that factoring.

[Mark Seaborn, 2010-07-15 21:51:48]

Hi David,

Could you possibly hold off on committing this until after the freeze, or at
least until after I have committed http://codereview.chromium.org/2971005/show?

Thanks,
Mark

[sehr (please use chromium), 2010-07-19 18:18:35]

I've update the CL to move the shared portion to plugin/  Comments would be
great.

David

[polina, 2010-07-19 21:34:05]

http://codereview.chromium.org/2981011/diff/36001/37004
File src/trusted/plugin/build.scons (right):

http://codereview.chromium.org/2981011/diff/36001/37004#newcode91
src/trusted/plugin/build.scons:91: # common subdirectory and on a large set of
libraries.
this is now "parent directory"

http://codereview.chromium.org/2981011/diff/36001/37070
File src/trusted/plugin/srpc/srpc_client.h (left):

http://codereview.chromium.org/2981011/diff/36001/37070#oldcode23
src/trusted/plugin/srpc/srpc_client.h:23: class SrpcClient {
so it does not make sense to leave the actual Srpc classes under srpc/?

http://codereview.chromium.org/2981011/diff/36001/37082
File src/trusted/plugin/srpc_client.h (left):

http://codereview.chromium.org/2981011/diff/36001/37082#oldcode10
src/trusted/plugin/srpc_client.h:10: #ifndef
NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SRPC_CLIENT_H_
I think you deleted the second _SRPC by accident.

[sehr (please use chromium), 2010-07-19 22:34:04]

Thanks for those comments.  New version uploaded.

http://codereview.chromium.org/2981011/diff/36001/37004
File src/trusted/plugin/build.scons (right):

http://codereview.chromium.org/2981011/diff/36001/37004#newcode91
src/trusted/plugin/build.scons:91: # common subdirectory and on a large set of
libraries.
On 2010/07/19 21:34:05, polina wrote:
> this is now "parent directory"

Done.

http://codereview.chromium.org/2981011/diff/36001/37070
File src/trusted/plugin/srpc/srpc_client.h (left):

http://codereview.chromium.org/2981011/diff/36001/37070#oldcode23
src/trusted/plugin/srpc/srpc_client.h:23: class SrpcClient {
On 2010/07/19 21:34:05, polina wrote:
> so it does not make sense to leave the actual Srpc classes under srpc/?

Having a separate subdirectory for SRPC came from a time when we had two parts
to the plugin, the npapi (direct proxying) and SRPC.  SRPC is now the only
protocol, so I don't think we need to have a subdirectory.

http://codereview.chromium.org/2981011/diff/36001/37082
File src/trusted/plugin/srpc_client.h (left):

http://codereview.chromium.org/2981011/diff/36001/37082#oldcode10
src/trusted/plugin/srpc_client.h:10: #ifndef
NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SRPC_SRPC_CLIENT_H_
On 2010/07/19 21:34:05, polina wrote:
> I think you deleted the second _SRPC by accident.

You're right.  Fixed.

[polina, 2010-07-20 00:18:58]

lgtm